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

Timestamp:

Feb 12, 2015, 12:35:20 PM (9 years ago)

Author:

knut

Message:

Added function getLastErrorMessage() (service_internal.c). Fixed problems caused by differing return types for GetLastError?() (unsigned int) and dlerror() (char*). Added DEBUG-conditional macros for diagnostic output in zoo_service_loader.c.

File:

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

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

@@ -455 +455 @@
 #endif
 #ifdef WIN32
-      DWORD errstr;
-      errstr = GetLastError ();
+      char* errstr = getLastErrorMessage();
 #else
       char *errstr;
@@ -462 +461 @@
 #endif
 #ifdef DEBUG
-      fprintf (stderr, "%s loaded (%d) \n", tmps1, errstr);
+          fprintf (stderr, "%s loaded (%s) \n", tmps1, errstr);
 #endif
       if (so != NULL)
@@ -494 +493 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
+                          errstr = getLastErrorMessage();
 #else
               errstr = dlerror ();
@@ -529 +528 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
-              fprintf (stderr, "Function %s failed to load because of %d\n",
+                          errstr = getLastErrorMessage();
+              fprintf (stderr, "Function %s failed to load because of %s\n",
                        r_inputs->value, errstr);
 #endif
@@ -549 +548 @@
                 {
 #ifdef WIN32
-                  errstr = GetLastError ();
+                                  errstr = getLastErrorMessage();
 #else
                   errstr = dlerror ();
@@ -571 +570 @@
 #ifdef DEBUG
 #ifdef WIN32
-              errstr = GetLastError ();
+                          errstr = getLastErrorMessage();
 #else
               errstr = dlerror ();
@@ -604 +603 @@
           char tmps[1024];
 #ifdef WIN32
-          DWORD errstr = GetLastError ();
+                  errstr = getLastErrorMessage();
 #else
-          char *errstr = dlerror ();
+              errstr = dlerror ();
 #endif
           sprintf (tmps, _("C Library can't be loaded %s"), errstr);
@@ -2843 +2842 @@
    */
   map* errI=NULL;
+#ifdef DEBUG  
   dumpMaps(request_input_real_format);
+#endif  
   char *dfv = addDefaultValues (&request_input_real_format, s1->inputs, m, 0,&errI);
+#ifdef DEBUG  
   dumpMaps(request_input_real_format);
+#endif  
   maps *ptr = request_input_real_format;
   while (ptr != NULL)