[open-ils-commits] r11585 - trunk/Open-ILS/src/c-apps

[svn at svn.open-ils.org]

Author: miker
Date: 2008-12-15 16:32:56 -0500 (Mon, 15 Dec 2008)
New Revision: 11585

Modified:
   trunk/Open-ILS/src/c-apps/oils_cstore.c
Log:
fix type (pointer * missing); rearange vars to avoid warnings about unused vars

Modified: trunk/Open-ILS/src/c-apps/oils_cstore.c
===================================================================
--- trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-12-15 21:27:24 UTC (rev 11584)
+++ trunk/Open-ILS/src/c-apps/oils_cstore.c	2008-12-15 21:32:56 UTC (rev 11585)
@@ -192,9 +192,6 @@
 
         int i = 0; 
         char* method_type;
-        char* st_tmp = NULL;
-        char* _fm;
-        char* part;
         osrfHash* method_meta;
         while ( (method_type = osrfStringArrayGetString(global_methods, i++)) ) {
             osrfLogDebug(OSRF_LOG_MARK, "Using files to build %s class methods for %s", method_type, classname);
@@ -226,7 +223,9 @@
 #ifdef PCRUD
             buffer_fadd(method_name, "%s.%s.%s", MODULENAME, method_type, classname);
 #else
-            _fm = strdup( (char*)osrfHashGet(idlClass, "fieldmapper") );
+            char* st_tmp = NULL;
+            char* part = NULL;
+            char* _fm = strdup( (char*)osrfHashGet(idlClass, "fieldmapper") );
             part = strtok_r(_fm, ":", &st_tmp);
 
             buffer_fadd(method_name, "%s.direct.%s", MODULENAME, part);
@@ -235,10 +234,10 @@
                 buffer_fadd(method_name, ".%s", part);
             }
             buffer_fadd(method_name, ".%s", method_type);
+            free(_fm);
 #endif
 
             char* method = buffer_release(method_name);
-            free(_fm);
 
             osrfHashSet( method_meta, method, "methodname" );
             osrfHashSet( method_meta, strdup(method_type), "methodtype" );
@@ -909,14 +908,11 @@
         return 0;
     }
 
-    jsonObject user = verifyUserPCRUD( ctx );
+    jsonObject* user = verifyUserPCRUD( ctx );
     if (!user) return 0;
 
     int userid = atoi( oilsFMGetString( user, "id" ) );
-	osrfLogDebug( OSRF_LOG_MARK, "permacrud checking user %d (auth token: %s)", userid, auth );
-
     jsonObjectFree(user);
-    free(auth);
 
     osrfStringArray* permission = osrfHashGet(pcrud, "permission");
     char* global_required = osrfHashGet(pcrud, "global_required");