Changeset 379 for trunk/zoo-project/zoo-kernel/zoo_service_loader.c

Timestamp:

Dec 23, 2012, 11:50:33 AM (10 years ago)

Author:

djay

Message:

Fix handling of multiple outputs. Small fix to build with bleeding edge gcc. Add missing copyright in service_internal_ms.c/h. Better gesture of session data. Update HISTORY.txt content.

File:

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

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

@@ -775 +775 @@
         memset(buff1,0,1024);
 #ifdef DEBUG
-        fprintf(stderr,"\n#######%s\n########\n",buff1);
+        printf("\n#######%s\n########\n",buff1);
 #endif
         while ((dp = readdir(dirp)) != NULL)
@@ -784 +784 @@
             s1=(service*)calloc(1,SERVICE_SIZE);
             if(s1 == NULL){
+              dup2(saved_stdout,fileno(stdout));
               return errorException(m, _("Unable to allocate memory."),"InternalError");
             }
 #ifdef DEBUG
-            fprintf(stderr,"#################\n%s\n#################\n",buff1);
+            printf("#################\n%s\n#################\n",buff1);
 #endif
             t=getServiceFromFile(buff1,&s1);
@@ -1325 +1326 @@
                   if(!(ltmp!=NULL && strcmp(ltmp->value,"POST")==0)
                      && CHECK_INET_HANDLE(hInternet)){
-                    if(loadRemoteFile(m,tmpmaps->content,hInternet,(char*)val)){
+                    if(loadRemoteFile(m,tmpmaps->content,hInternet,(char*)val)!=0){
                       freeMaps(&m);
                       free(m);