[SCM] libav/experimental: use ctime1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:23:54 UTC 2013
The following commit has been merged in the experimental branch:
commit 9fd3442f632e7144249305ebcc120d245d03a916
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sun Jun 22 01:12:39 2008 +0000
use ctime1
Originally committed as revision 13864 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index 76f0f8a..0ed20e4 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -304,6 +304,20 @@ static AVRandomState random_state;
static FILE *logfile = NULL;
+static char *ctime1(char *buf2)
+{
+ time_t ti;
+ char *p;
+
+ ti = time(NULL);
+ p = ctime(&ti);
+ strcpy(buf2, p);
+ p = buf2 + strlen(p) - 1;
+ if (*p == '\n')
+ *p = '\0';
+ return buf2;
+}
+
static void __attribute__ ((format (printf, 1, 2))) http_log(const char *fmt, ...)
{
static int print_prefix = 1;
@@ -312,11 +326,9 @@ static void __attribute__ ((format (printf, 1, 2))) http_log(const char *fmt, ..
if (logfile) {
if (print_prefix) {
- time_t current = time(0);
- char buffer[32];
- strncpy(buffer, ctime(¤t), 31);
- buffer[strlen(buffer)-1] = 0; // remove '\n'
- fprintf(logfile, "%s ", buffer);
+ char buf[32];
+ ctime1(buf);
+ fprintf(logfile, "%s ", buf);
}
print_prefix = strstr(fmt, "\n") != NULL;
vfprintf(logfile, fmt, ap);
@@ -325,20 +337,6 @@ static void __attribute__ ((format (printf, 1, 2))) http_log(const char *fmt, ..
va_end(ap);
}
-static char *ctime1(char *buf2)
-{
- time_t ti;
- char *p;
-
- ti = time(NULL);
- p = ctime(&ti);
- strcpy(buf2, p);
- p = buf2 + strlen(p) - 1;
- if (*p == '\n')
- *p = '\0';
- return buf2;
-}
-
static void log_connection(HTTPContext *c)
{
char buf2[32];
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list