svn commit: r569941 - in /httpd/httpd/branches/2.2.x: CHANGES server/main.c

[wr...@apache.org]

Author: wrowe
Date: Sun Aug 26 18:05:52 2007
New Revision: 569941

URL: http://svn.apache.org/viewvc?rev=569941&view=rev
Log:
Thanks to Jeff, identify a wasted byte and ensure this message
is the final word (as in end-of-the-line final word).

Backport: r569934

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/main.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=569941&r1=569940&r2=569941&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Aug 26 18:05:52 2007
@@ -28,7 +28,7 @@
 
   *) main core: Emit errors during the initial apr_app_initialize()
      or apr_pool_create() (when apr-based error reporting is not ready).
-     [William Rowe]
+     [William Rowe, Jeff Trawick]
 
   *) log core: fix the new piped logger case where we couldn't connect 
      the replacement stderr logger's stderr to the NULL stdout stream.  

Modified: httpd/httpd/branches/2.2.x/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/main.c?rev=569941&r1=569940&r2=569941&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/main.c (original)
+++ httpd/httpd/branches/2.2.x/server/main.c Sun Aug 26 18:05:52 2007
@@ -268,6 +268,7 @@
     apr_pool_t *cntx;
     apr_status_t stat;
     const char *failed = "apr_app_initialize()";
+
     stat = apr_app_initialize(argc, argv, NULL);
     if (stat == APR_SUCCESS) {
         failed = "apr_pool_create()";
@@ -279,11 +280,10 @@
          * but APR doesn't exist yet, we can't use it for reporting
          * these earliest two failures;
          */
-        char ctimebuff[APR_CTIME_LEN + 1];
+        char ctimebuff[APR_CTIME_LEN];
         apr_ctime(ctimebuff, apr_time_now());
-        ctimebuff[APR_CTIME_LEN] = '\0';
         fprintf(stderr, "[%s] [crit] (%d) %s: %s failed "
-                        "to initial context, exiting", 
+                        "to initial context, exiting\n", 
                         ctimebuff, stat, (*argv)[0], failed);
         apr_terminate();
         exit(1);