Changeset 114 for trunk/zoo-kernel/zoo_service_loader.c

Timestamp:

Feb 12, 2011, 4:14:17 PM (13 years ago)

Author:

djay

Message:

Code cleanup to avoid most of the warning messages at compilation time.

File:

• trunk/zoo-kernel/zoo_service_loader.c (modified) (38 diffs)

trunk/zoo-kernel/zoo_service_loader.c

@@ -94 +94 @@
 }
 
-xmlXPathObjectPtr extractFromDoc(xmlDocPtr doc,char* search){
+xmlXPathObjectPtr extractFromDoc(xmlDocPtr doc,const char* search){
   xmlXPathContextPtr xpathCtx;
   xmlXPathObjectPtr xpathObj;
@@ -110 +110 @@
 void sig_handler(int sig){
   char tmp[100];
-  char *ssig;
+  const char *ssig;
   switch(sig){
   case SIGSEGV:
@@ -153 +153 @@
   map* r_inputs=NULL;
 #ifndef WIN32
-  getcwd(ntmp,1024);
+  char* pntmp=getcwd(ntmp,1024);
 #else
   _getcwd(ntmp,1024);
@@ -360 +360 @@
 #endif
 
-  map* r_inputs=NULL,*tmps=NULL;
+  map* r_inputs=NULL;
   maps* m=NULL;
-  int argc=count(request_inputs);
 
   char* REQUEST=NULL;
@@ -374 +373 @@
   char ntmp[1024];
 #ifndef WIN32
-  getcwd(ntmp,1024);
+  char *pntmp=getcwd(ntmp,1024);
 #else
   _getcwd(ntmp,1024);
@@ -470 +469 @@
   }
 
-  map* outputs=NULL;
   maps* request_output_real_format=NULL;
   map* tmpm=getMapFromMaps(m,"main","serverAddress");
@@ -478 +476 @@
     SERVICE_URL=strdup(DEFAULT_SERVICE_URL);
 
-  service* s[100];
   service* s1;
   int scount=0;
@@ -497 +494 @@
 
   if(strncasecmp(REQUEST,"GetCapabilities",15)==0){
-    int i=0;
     struct dirent *dp;
 #ifdef DEBUG
@@ -510 +506 @@
     r_inputs=getMap(request_inputs,"ServiceProvider");
     xmlNodePtr n;
-    //dumpMap(request_inputs);
     if(r_inputs!=NULL)
       n = printGetCapabilitiesHeader(doc,r_inputs->value,m);
@@ -595 +590 @@
       char buff[256];
       char buff1[1024];
-      int i=0;
-      int j=0;
-      int end=-1;
       int saved_stdout = dup(fileno(stdout));
       dup2(fileno(stderr),fileno(stdout));
@@ -611 +603 @@
             memset(buff1,0,1024);
             snprintf(buff1,1024,"%s/%s",conf_dir,dp->d_name);
-            //s1=(service*)malloc(sizeof(service*));
             s1=(service*)calloc(1,SERVICE_SIZE);
             if(s1 == NULL){
@@ -640 +631 @@
       free(SERVICE_URL);
       fflush(stdout);
-      //xmlFree(n);
 #ifndef LINUX_FREE_ISSUE
       if(s1)
@@ -654 +644 @@
 #endif  
         closedir(dirp);
-        free(s);
         return 0;
       }
@@ -703 +692 @@
   dumpService(s1);
 #endif
-  map* inputs=NULL;
-  elements* c_inputs=s1->inputs;
   int j;
   
@@ -747 +734 @@
       fprintf(stderr,"OUTPUT Parsing start now ... \n");
 #endif
-      char current_output_as_string[10240];
       char cursor_output[10240];
       char *cotmp=strdup(r_inputs->value);
@@ -753 +739 @@
       free(cotmp);
       j=0;
-      map* request_kvp_outputs=NULL;
         
       /**
@@ -834 +819 @@
         fflush(stderr);
 #endif
-        //tmp_output=tmp_output->next;
         free(tmp);
       }
@@ -848 +832 @@
     fprintf(stderr,"DATA INPUTS [%s]\n",r_inputs->value);
 #endif
-    char current_input_as_string[40960];
     char cursor_input[40960];
     if(r_inputs!=NULL)
@@ -864 +847 @@
     }
     j=0;
-    map* request_kvp_inputs=NULL;
   
     /**
@@ -907 +889 @@
         strncpy(tmpn,tmpc,(strlen(tmpc)-strlen(tmpv))*sizeof(char));
         tmpn[strlen(tmpc)-strlen(tmpv)]=0;
-        int cnt=0;
 #ifdef DEBUG
         fprintf(stderr,"***\n*** %s = %s ***\n",tmpn,tmpv+1);
@@ -1010 +991 @@
     fflush(stderr);
 #endif
-    xmlNodePtr cur = xmlDocGetRootElement(doc);
     /**
      * Parse every Input in DataInputs node.
      */
-    maps* tempMaps=NULL;
     xmlXPathObjectPtr tmpsptr=extractFromDoc(doc,"/*/*/*[local-name()='Input']");
     xmlNodeSet* tmps=tmpsptr->nodesetval;
@@ -1064 +1043 @@
                 return errorException(m, _("Unable to allocate memory."), "InternalError");
               }
-              tmpmaps->name="missingIndetifier";
+              tmpmaps->name=strdup("missingIndetifier");
               tmpmaps->content=createMap((char*)cur2->name,(char*)val);
               tmpmaps->next=NULL;
@@ -1093 +1072 @@
             fprintf(stderr,"REFERENCE\n");
 #endif
-            map* referenceMap=NULL;
-            char *refs[5];
+            const char *refs[5];
             refs[0]="mimeType";
             refs[1]="encoding";
@@ -1100 +1078 @@
             refs[3]="method";
             refs[4]="href";
-            char*url;
             for(int l=0;l<5;l++){
 #ifdef DEBUG
@@ -1142 +1119 @@
             while(cur3){
               if(xmlStrcasecmp(cur3->name,BAD_CAST "Header")==0 ){
-                xmlNodePtr cur4=cur3;
-                char *tmp=new char[cgiContentLength];
-                char *ha[2];
+                const char *ha[2];
                 ha[0]="key";
                 ha[1]="value";
@@ -1170 +1145 @@
                 }
                 hInternet.header=curl_slist_append(hInternet.header, has);
-                //free(has);
+                free(has);
               }
               else{
@@ -1302 +1277 @@
                  * dataType , uom
                  */
-                char *lits[2];
-                lits[0]="dataType";
-                lits[1]="uom";
+                char *list[2];
+                list[0]=strdup("dataType");
+                list[1]=strdup("uom");
                 for(int l=0;l<2;l++){
 #ifdef DEBUG
-                  fprintf(stderr,"*** LiteralData %s ***",lits[l]);
-#endif
-                  xmlChar *val=xmlGetProp(cur4,BAD_CAST lits[l]);
+                  fprintf(stderr,"*** LiteralData %s ***",list[l]);
+#endif
+                  xmlChar *val=xmlGetProp(cur4,BAD_CAST list[l]);
                   if(val!=NULL && strlen((char*)val)>0){
                     if(tmpmaps->content!=NULL)
-                      addToMap(tmpmaps->content,lits[l],(char*)val);
+                      addToMap(tmpmaps->content,list[l],(char*)val);
                     else
-                      tmpmaps->content=createMap(lits[l],(char*)val);
+                      tmpmaps->content=createMap(list[l],(char*)val);
                   }
 #ifdef DEBUG
@@ -1320 +1295 @@
 #endif
                   xmlFree(val);
+                  free(list[l]);
                 }
               }
@@ -1327 +1303 @@
                  * mimeType, encoding, schema
                  */
-                char *coms[3];
+                const char *coms[3];
                 coms[0]="mimeType";
                 coms[1]="encoding";
@@ -1368 +1344 @@
                 char *res=NULL;
                 char *curs=tmpv->value;
-                int i=0;
                 for(int i=0;i<=strlen(tmpv->value)/64;i++) {
                   if(res==NULL)
@@ -1421 +1396 @@
 #endif
     xmlXPathFreeObject(tmpsptr);
-    //xmlFree(tmps);
     
     tmpsptr=extractFromDoc(doc,"/*/*/*[local-name()='ResponseDocument']");
@@ -1439 +1413 @@
       else
         addToMap(request_inputs,"ResponseDocument","");
-      request_output_real_format;
       maps *tmpmaps=NULL;
       xmlNodePtr cur=tmps->nodeTab[k];
@@ -1451 +1424 @@
             return errorException(m, _("Unable to allocate memory."), "InternalError");
           }
-          tmpmaps->name="unknownIdentifier";
+          tmpmaps->name=strdup("unknownIdentifier");
           tmpmaps->next=NULL;
         }
@@ -1458 +1431 @@
          * storeExecuteResponse, lineage, status
          */
-        char *ress[3];
+        const char *ress[3];
         ress[0]="storeExecuteResponse";
         ress[1]="lineage";
@@ -1487 +1460 @@
              * mimeType, encoding, schema, uom, asReference
              */
-            char *outs[5];
+            const char *outs[5];
             outs[0]="mimeType";
             outs[1]="encoding";
@@ -1543 +1516 @@
                     return errorException(m, _("Unable to allocate memory."), "InternalError");
                   }
-                  tmpmaps->name="missingIndetifier";
+                  tmpmaps->name=strdup("missingIndetifier");
                   tmpmaps->content=createMap((char*)cur2->name,(char*)val);
                   tmpmaps->next=NULL;
@@ -1563 +1536 @@
         }
       }
-      //xmlFree(cur);
       if(request_output_real_format==NULL)
         request_output_real_format=dupMaps(&tmpmaps);
@@ -1576 +1548 @@
 
     xmlXPathFreeObject(tmpsptr);
-    //xmlFree(tmps);
     xmlCleanupParser();
   }