[Opensrf-commits] r1940 - trunk/src/c-apps (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-03-22 15:21:15 -0400 (Mon, 22 Mar 2010)
New Revision: 1940

Modified:
   trunk/src/c-apps/osrf_version.c
Log:
Added a const qualifier to one variable.

Tidied up white space.

M    src/c-apps/osrf_version.c


Modified: trunk/src/c-apps/osrf_version.c
===================================================================
--- trunk/src/c-apps/osrf_version.c	2010-03-22 19:11:57 UTC (rev 1939)
+++ trunk/src/c-apps/osrf_version.c	2010-03-22 19:21:15 UTC (rev 1940)
@@ -13,15 +13,15 @@
 
 int osrfAppInitialize() {
 
-	osrfAppRegisterMethod( 
-			"opensrf.version", 
-			"opensrf.version.verify", 
-			"osrfVersion", 
+	osrfAppRegisterMethod(
+			"opensrf.version",
+			"opensrf.version.verify",
+			"osrfVersion",
 			"The data for a service/method/params combination will be retrieved "
 			"from the necessary server and the MD5 sum of the total values received "
-			"will be returned. PARAMS( serviceName, methodName, [param1, ...] )", 
+			"will be returned. PARAMS( serviceName, methodName, [param1, ...] )",
 			2, 0 );
-	
+
 	return 0;
 }
 
@@ -39,7 +39,7 @@
 	char* json = jsonObjectToJSON(ctx->params);
 	char* paramsmd5 = md5sum(json);
 	char* cachedmd5 = osrfCacheGetString(paramsmd5);
-	free(json); 
+	free(json);
 
 	if( cachedmd5 ) {
 		osrfLogDebug(OSRF_LOG_MARK,  "Found %s object in cache, returning....", cachedmd5 );
@@ -60,7 +60,7 @@
 		/* shove the additional params into an array */
 		jsonObject* tmpArray = jsonNewObject(NULL);
 		int i;
-		for( i = 2; i != ctx->params->size; i++ ) 
+		for( i = 2; i != ctx->params->size; i++ )
 			jsonObjectPush( tmpArray, jsonObjectClone(jsonObjectGetIndex(ctx->params, i)));
 
 		osrfAppSession* ses = osrfAppSessionClientInit(service);
@@ -70,7 +70,7 @@
 
 		if( omsg ) {
 
-			jsonObject* result = osrfMessageGetResult( omsg );
+			const jsonObject* result = osrfMessageGetResult( omsg );
 			char* resultjson = jsonObjectToJSON(result);
 			char* resultmd5 = md5sum(resultjson);
 			free(resultjson);
@@ -81,12 +81,13 @@
 				osrfAppRespondComplete( ctx, resp );
 				jsonObjectFree(resp);
 				osrfAppSessionFree(ses);
-				osrfLogDebug(OSRF_LOG_MARK, "Found version string %s, caching and returning...", resultmd5 );
+				osrfLogDebug(OSRF_LOG_MARK, 
+					"Found version string %s, caching and returning...", resultmd5 );
 				osrfCachePutString( paramsmd5, resultmd5, OSRF_VERSION_CACHE_TIME );
 				free(resultmd5);
 				free(paramsmd5);
 				return 0;
-			} 
+			}
 		}
 		osrfAppSessionFree(ses);
 	}
@@ -95,6 +96,3 @@
 
 	return -1;
 }
-
-
-