[Opensrf-commits] r1097 - in trunk/src: . libopensrf srfsh

[svn at svn.open-ils.org]

Author: miker
Date: 2007-09-30 14:53:17 -0400 (Sun, 30 Sep 2007)
New Revision: 1097

Modified:
   trunk/src/Makefile
   trunk/src/libopensrf/osrf_app_session.c
   trunk/src/srfsh/srfsh.c
Log:
Patch from Dan Scott to:

1) fix typos and output alignment
2) include _LARGEFILE64_SOURCE in the makefile to make 32b linux happy



Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2007-09-30 17:56:45 UTC (rev 1096)
+++ trunk/src/Makefile	2007-09-30 18:53:17 UTC (rev 1097)
@@ -10,7 +10,7 @@
 
 export LDLIBS	+= 
 export LDFLAGS	+= -Wl,-rpath=$(LIBDIR) -L $(TMPDIR) -L .
-export CFLAGS	+= -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) 
+export CFLAGS	+= -D_LARGEFILE64_SOURCE -pipe -g -Wall -O2 -fPIC -I ../../include/ -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) 
 
 ifeq ($(OSRF_LEGACY_JSON), 1)
 export LDLIBS += -lobjson

Modified: trunk/src/libopensrf/osrf_app_session.c
===================================================================
--- trunk/src/libopensrf/osrf_app_session.c	2007-09-30 17:56:45 UTC (rev 1096)
+++ trunk/src/libopensrf/osrf_app_session.c	2007-09-30 18:53:17 UTC (rev 1097)
@@ -142,7 +142,7 @@
 		if(req->reset_timeout) {
 			remaining = (time_t) timeout;
 			req->reset_timeout = 0;
-			osrfLogDebug( OSRF_LOG_MARK, "Recevied a timeout reset");
+			osrfLogDebug( OSRF_LOG_MARK, "Received a timeout reset");
 		} else {
 			remaining -= (int) (time(NULL) - start);
 		}
@@ -411,7 +411,7 @@
 		return -1;
 	}
 
-	osrfLogDebug( OSRF_LOG_MARK,  "Pushing [%d] onto requeust queue for session [%s] [%s]",
+	osrfLogDebug( OSRF_LOG_MARK,  "Pushing [%d] onto request queue for session [%s] [%s]",
 			req->request_id, session->remote_service, session->session_id );
 	osrfListSet( session->request_queue, req, req->request_id ); 
 	return req->request_id;

Modified: trunk/src/srfsh/srfsh.c
===================================================================
--- trunk/src/srfsh/srfsh.c	2007-09-30 17:56:45 UTC (rev 1096)
+++ trunk/src/srfsh/srfsh.c	2007-09-30 18:53:17 UTC (rev 1097)
@@ -766,47 +766,47 @@
 			"---------------------------------------------------------------------------------\n"
 			"Commands:\n"
 			"---------------------------------------------------------------------------------\n"
-			"help			- Display this message\n"
-			"!<command> [args] - Forks and runs the given command in the shell\n"
+			"help                   - Display this message\n"
+			"!<command> [args]      - Forks and runs the given command in the shell\n"
 		/*
 			"time			- Prints the current time\n"
-			"time <timestamp>	- Formats seconds since epoch into readable format\n"	
+			"time <timestamp>	- Formats seconds since epoch into readable format\n"
 		*/
 			"set <variable> <value> - set a srfsh variable (e.g. set pretty_print true )\n"
-			"print <variable>		- Displays the value of a srfsh variable\n"
+			"print <variable>       - Displays the value of a srfsh variable\n"
 			"---------------------------------------------------------------------------------\n"
 
 			"router query servers <server1 [, server2, ...]>\n"
-			"	- Returns stats on connected services\n"
+			"       - Returns stats on connected services\n"
 			"\n"
 			"\n"
 			"request <service> <method> [ <json formatted string of params> ]\n"
-			"	- Anything passed in will be wrapped in a json array,\n"
-			"		so add commas if there is more than one param\n"
+			"       - Anything passed in will be wrapped in a json array,\n"
+			"               so add commas if there is more than one param\n"
 			"\n"
 			"\n"
 			"relay <service> <method>\n"
-			"	- Performs the requested query using the last received result as the param\n"
+			"       - Performs the requested query using the last received result as the param\n"
 			"\n"
 			"\n"
 			"math_bench <num_batches> [0|1|2]\n"
-			"	- 0 means don't reconnect, 1 means reconnect after each batch of 4, and\n"
-			"		 2 means reconnect after every request\n"
+			"       - 0 means don't reconnect, 1 means reconnect after each batch of 4, and\n"
+			"                2 means reconnect after every request\n"
 			"\n"
 			"introspect <service>\n"
-			"	- prints the API for the service\n"
+			"       - prints the API for the service\n"
 			"\n"
 			"\n"
 			"---------------------------------------------------------------------------------\n"
 			" Commands for Open-ILS\n"
 			"---------------------------------------------------------------------------------\n"
 			"login <username> <password>\n"
-			"	-	Logs into the 'server' and displays the session id\n"
-			"	- To view the session id later, enter: print login\n"
+			"       - Logs into the 'server' and displays the session id\n"
+			"       - To view the session id later, enter: print login\n"
 			"---------------------------------------------------------------------------------\n"
 			"\n"
 			"\n"
-			"Note: long output is piped through 'less'.  To search in 'less', type: /<search>\n"
+			"Note: long output is piped through 'less'. To search in 'less', type: /<search>\n"
 			"---------------------------------------------------------------------------------\n"
 			"\n"
 			);