Quick little cleanup for generic.qc command code

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 68ee8c7129c89c90be0cd2fa807e422f80b77539..a4389b13961b9cf4d6a991560be910f23fec25cd 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -17,6 +17,33 @@ string GetProgramCommandPrefix(void)
        #endif
 }
 
+// used by curl command
+void Curl_URI_Get_Callback(float id, float status, string data)
+{
+       float i;
+       float do_exec;
+       string do_cvar;
+       i = id - URI_GET_CURL;
+       do_exec = curl_uri_get_exec[i];
+       do_cvar = curl_uri_get_cvar[i];
+       if(status != 0)
+       {
+               print(sprintf(_("error: status is %d\n"), status));
+               if(do_cvar)
+                       strunzone(do_cvar);
+               return;
+       }
+       if(do_exec)
+               localcmd(data);
+       if(do_cvar)
+       {
+               cvar_set(do_cvar, data);
+               strunzone(do_cvar);
+       }
+       if(!do_exec && !do_cvar)
+               print(data);
+}
+
 
 // =======================
 //  Command Sub-Functions
@@ -65,35 +92,6 @@ void GenericCommand_addtolist(float request, float argc)
        }
 }
 
-float curl_uri_get_pos;
-float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
-string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
-void Curl_URI_Get_Callback(float id, float status, string data)
-{
-       float i;
-       float do_exec;
-       string do_cvar;
-       i = id - URI_GET_CURL;
-       do_exec = curl_uri_get_exec[i];
-       do_cvar = curl_uri_get_cvar[i];
-       if(status != 0)
-       {
-               print(sprintf(_("error: status is %d\n"), status));
-               if(do_cvar)
-                       strunzone(do_cvar);
-               return;
-       }
-       if(do_exec)
-               localcmd(data);
-       if(do_cvar)
-       {
-               cvar_set(do_cvar, data);
-               strunzone(do_cvar);
-       }
-       if(!do_exec && !do_cvar)
-               print(data);
-}
-
 void GenericCommand_curl(float request, float argc)
 {
        switch(request)

diff --git a/qcsrc/common/command/generic.qh b/qcsrc/common/command/generic.qh
index 4391555c6cabe2c3828bed9d4e9d9b85c15bdf8a..be096db17f832162b4b7a235eeaa9c612882af0c 100644 (file)
--- a/qcsrc/common/command/generic.qh
+++ b/qcsrc/common/command/generic.qh
@@ -17,3 +17,6 @@ string GetProgramCommandPrefix(void);
 void GenericCommand_macro_write_aliases(float fh);
 
 void Curl_URI_Get_Callback(float id, float status, string data);
+float curl_uri_get_pos;
+float curl_uri_get_exec[URI_GET_CURL_END - URI_GET_CURL + 1];
+string curl_uri_get_cvar[URI_GET_CURL_END - URI_GET_CURL + 1];
\ No newline at end of file