fixed up arg length defines

diff --git a/server/mr_server.h b/server/mr_server.h
index 6feb16a9b74e7d77c6ba11a83f4263a8a75497f7..c55d0660d75e10686a5223c3d42ecce511290512 100644 (file)
--- a/server/mr_server.h
+++ b/server/mr_server.h
@@ -87,6 +87,8 @@ extern int log_flags;
 
 /* max length of query argument allowed */
 #define ARGLEN 257
+/* Used to setup static argv, maximum argc */
+#define QMAXARGS       20
 
 /* statistics on number of queries by version number */
 extern int newqueries, oldqueries;

diff --git a/server/qsupport.dc b/server/qsupport.dc
index dc75c5c58d2d950cde320becc18e419de211c186..5ebac61a420280d97f2d6dc6a74956c6c19a2355 100644 (file)
--- a/server/qsupport.dc
+++ b/server/qsupport.dc
@@ -4025,11 +4025,11 @@ MR_SQLDA_T *mr_alloc_SQLDA()
     }
 
     for(j=0; j<QMAXARGS; j++) {
-       if((it->sqlvar[j].sqldata=malloc(sizeof(short)+QMAXARGSIZE))==NULL) {
+       if((it->sqlvar[j].sqldata=malloc(sizeof(short)+ARGLEN))==NULL) {
            com_err(whoami, MR_NO_MEM, "setting up SQLDA variables");
            exit(1);
        }
-       it->sqlvar[j].sqllen=QMAXARGSIZE;
+       it->sqlvar[j].sqllen=ARGLEN;
        it->sqlvar[j].sqlind=null_indicators+j;
        null_indicators[j]=0;
     }
@@ -4145,7 +4145,7 @@ prefetch_filesys(q,argv,cl)
 convert_wildcards(arg)
     char *arg;
 {
-    static char buffer[QMAXARGSIZE];
+    static char buffer[ARGLEN];
     register char *s, *d;
 
     for(d=buffer,s=arg;*s;s++) {
@@ -4175,7 +4175,7 @@ convert_wildcards(arg)
 convert_wildcards_uppercase(arg)
     char *arg;
 {
-    static char buffer[QMAXARGSIZE];
+    static char buffer[ARGLEN];
     register char *s, *d;
 
     for(d=buffer,s=arg;*s;s++) {

diff --git a/server/query.h b/server/query.h
index 61fea6cfd622402015a15f5b14eb1660bfb5f5ed..9a0e9aef7f049ada01da61ad6f424a6e0764fdc0 100644 (file)
--- a/server/query.h
+++ b/server/query.h
@@ -58,8 +58,3 @@ struct valobj
     char *idfield;             /* table's corresponding id field (if any) */
     int error;
 };
-
-/* Used to setup static argv, maximum argc and argument lengths */
-#define QMAXARGS       20
-#define QMAXARGSIZE    513
-