[xiph-commits] r9307 - icecast/trunk/icecast/src

[karl at motherfish-iii.xiph.org]

Author: karl
Date: 2005-05-24 18:43:33 -0700 (Tue, 24 May 2005)
New Revision: 9307

Modified:
   icecast/trunk/icecast/src/logging.c
   icecast/trunk/icecast/src/logging.h
Log:
fix win32 access.log entries, the rest is just cosmetic 


Modified: icecast/trunk/icecast/src/logging.c
===================================================================
--- icecast/trunk/icecast/src/logging.c	2005-05-24 03:06:50 UTC (rev 9306)
+++ icecast/trunk/icecast/src/logging.c	2005-05-25 01:43:33 UTC (rev 9307)
@@ -80,7 +80,7 @@
     else {
         sign = '+';
     }
-    
+
     timezone_string = calloc(1, 7);
     snprintf(timezone_string, 7, " %c%.2d%.2d", sign, time_tz / 60, time_tz % 60);
 
@@ -119,11 +119,11 @@
 
     now = time(NULL);
 
-	localtime_r (&now, &thetime);
+    localtime_r (&now, &thetime);
     /* build the data */
 #ifdef _WIN32
-	memset(datebuf, '\000', sizeof(datebuf));
-	get_clf_time(datebuf, sizeof(datebuf)-1, &thetime);
+    memset(datebuf, '\000', sizeof(datebuf));
+    get_clf_time(datebuf, sizeof(datebuf)-1, &thetime);
 #else
     strftime (datebuf, sizeof(datebuf), LOGGING_FORMAT_CLF, &thetime);
 #endif
@@ -144,20 +144,21 @@
     if (user_agent == NULL)
         user_agent = "-";
 
-    log_write_direct (accesslog, "%s - - [%s] \"%s\" %d %lld \"%s\" \"%s\" %u",
-             client->con->ip,
-             datebuf,
-             reqbuf,
-             client->respcode,
-             client->con->sent_bytes,
-             referrer,
-             user_agent,
-             stayed);
+    log_write_direct (accesslog,
+            "%s - - [%s] \"%s\" %d " FORMAT_UINT64 " \"%s\" \"%s\" %lu",
+            client->con->ip,
+            datebuf,
+            reqbuf,
+            client->respcode,
+            client->con->sent_bytes,
+            referrer,
+            user_agent,
+            (unsigned long)stayed);
 }
 /* This function will provide a log of metadata for each
    mountpoint.  The metadata *must* be in UTF-8, and thus
    you can assume that the log itself is UTF-8 encoded */
-void logging_playlist(char *mount, char *metadata, long listeners)
+void logging_playlist(const char *mount, const char *metadata, long listeners)
 {
     char datebuf[128];
     struct tm thetime;

Modified: icecast/trunk/icecast/src/logging.h
===================================================================
--- icecast/trunk/icecast/src/logging.h	2005-05-24 03:06:50 UTC (rev 9306)
+++ icecast/trunk/icecast/src/logging.h	2005-05-25 01:43:33 UTC (rev 9307)
@@ -89,15 +89,8 @@
 #define LOGGING_FORMAT_CLF "%d/%b/%Y:%H:%M:%S %z"
 
 void logging_access(client_t *client);
-void logging_playlist(char *mount, char *metadata, long listeners);
+void logging_playlist(const char *mount, const char *metadata, long listeners);
 void restart_logging (ice_config_t *config);
 
 #endif  /* __LOGGING_H__ */
 
-
-
-
-
-
-
-