Changeset 741 for branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/caching.c

Timestamp:

Oct 7, 2015, 8:41:43 AM (9 years ago)

Author:

david

Message:

 

File:

• branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/caching.c (modified) (6 diffs)

branches/PublicaMundi_David_integration_01-devel/zoo-project/zoo-kernel/caching.c

@@ -215 +215 @@
             fcontent=(char*)malloc((hInternet->ihandle[index].nDataLen+1)*sizeof(char));
             if(fcontent == NULL){
-              return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
+              return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL,NULL);
             }
             size_t dwRead;
@@ -233 +233 @@
             tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
             if(tmpMap->value==NULL){
-              return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
+              return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL,NULL);
             }
             memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
@@ -277 +277 @@
 void addRequestToQueue(maps** m,HINTERNET* hInternet,const char* url,bool req){
   hInternet->waitingRequests[hInternet->nb]=strdup(url);
-  hInternet->ihandle[hInternet->nb].header=NULL;
+  //hInternet->ihandle[hInternet->nb].header=NULL;
   if(req)
     InternetOpenUrl(hInternet,hInternet->waitingRequests[hInternet->nb],NULL,0,INTERNET_FLAG_NO_CACHE_WRITE,0);
@@ -304 +304 @@
  */
 int loadRemoteFile(maps** m,map** content,HINTERNET* hInternet,char *url){
-  char* fcontent;
+  char* fcontent = NULL;
   char* cached=isInCache(*m,url);
   char *mimeType=NULL;
@@ -338 +338 @@
     }
 
-  }else{    
+  }else{
     addRequestToQueue(m,hInternet,url,true);
     return 0;
   }
   if(fsize==0){
-    return errorException(*m, _("Unable to download the file."), "InternalError",NULL);
+    return errorException(*m, _("Unable to download the file."), "InternalError",NULL,NULL);
   }
   if(mimeType!=NULL){
@@ -354 +354 @@
 
   tmpMap->value=(char*)malloc((fsize+1)*sizeof(char));
-  if(tmpMap->value==NULL)
-    return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL);
+ 
+ if(tmpMap->value==NULL || fcontent == NULL)
+    return errorException(*m, _("Unable to allocate memory"), "InternalError",NULL,NULL);
   memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
+
+ 
+ 
+ 
+  //if(tmpMap->value==NULL)
+    //return errorException(*m, _("Unable to allocate memory."), "InternalError",NULL,NULL);
+  //memcpy(tmpMap->value,fcontent,(fsize+1)*sizeof(char));
 
   char ltmp1[256];