Changeset 841

Timestamp:

Aug 7, 2017, 6:32:01 PM (7 years ago)

Author:

jmckenna

Message:

handle variable declarations on Windows

File:

• trunk/zoo-project/zoo-kernel/ulinet.c (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/ulinet.c

@@ -83 +83 @@
     int i;
     char* tmp;
+    int cnt;
+    _HINTERNET *psInternet;
     for(i=0;i<12;i++)
 #ifndef WIN32
@@ -90 +92 @@
 #endif
     tmp=strtok(buffer,";");
-    int cnt=0;
-    _HINTERNET *psInternet=(_HINTERNET *)data;
+    cnt=0;
+    psInternet=(_HINTERNET *)data;
     if(tmp!=NULL && psInternet!=NULL){
       psInternet->cookie=(char*)malloc(sizeof(char)*(strlen(tmp)+1));
@@ -244 +246 @@
 int isProtectedHost(const char* protectedHosts,const char* url){
   char *token, *saveptr;
+  int cnt;
+  char* host;  
   token = strtok_r (url, "//", &saveptr);
-  int cnt=0;
-  char* host;
+  cnt=0;
   while(token!=NULL && cnt<=1){
     fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,token);
@@ -279 +282 @@
     char *tmp=zStrdup(passThrough->value);
     char *token, *saveptr;
+    int i;    
     token = strtok_r (tmp, ",", &saveptr);
-    int i;
     for(i=0;i<handle->nb;i++){
       if(targetHosts->value[0]=='*' || isProtectedHost(targetHosts->value,handle->ihandle[i].url)==1){
         while (token != NULL){
+          int j;
+      map* tmpMap;        
           int length=strlen(token)+6;
           char* tmp1=(char*)malloc(length*sizeof(char));
           snprintf(tmp1,6,"HTTP_");
-          int j;
           for(j=0;token[j]!='\0';j++){
             if(token[j]!='-')
@@ -296 +300 @@
           }
           fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,tmp1);
-          map* tmpMap = getMapFromMaps(conf,"renv",tmp1);
+          tmpMap = getMapFromMaps(conf,"renv",tmp1);
           if(tmpMap!=NULL)          
             AddMissingHeaderEntry(&handle->ihandle[i],token,tmpMap->value);