Patch from Dan Scott to:

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

git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1097 9efc2488-bf62-4759-914b-345cdb29e865

diff --git a/src/Makefile b/src/Makefile
index d377724..ce20b14 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,7 +10,7 @@ export INCLUDEDIR= $(PREFIX)/include
 
 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

diff --git a/src/libopensrf/osrf_app_session.c b/src/libopensrf/osrf_app_session.c
index 308048d..e6f25f7 100644 (file)
--- a/src/libopensrf/osrf_app_session.c
+++ b/src/libopensrf/osrf_app_session.c
@@ -142,7 +142,7 @@ osrf_message* _osrf_app_request_recv( osrf_app_request* req, int timeout ) {
                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 @@ int osrf_app_session_make_locale_req(
                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;

diff --git a/src/srfsh/srfsh.c b/src/srfsh/srfsh.c
index b170193..b58677a 100644 (file)
--- a/src/srfsh/srfsh.c
+++ b/src/srfsh/srfsh.c
@@ -766,47 +766,47 @@ static int print_help( void ) {
                        "---------------------------------------------------------------------------------\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"
                        );