Blame SOURCES/conman-0.2.5-strftime.patch
|
 |
b5c7fc |
diff -urpN conman-0.2.5.orig/util-str.c conman-0.2.5/util-str.c
|
|
|
b5c7fc |
--- conman-0.2.5.orig/util-str.c 2009-02-13 07:11:56.000000000 +0100
|
|
|
b5c7fc |
+++ conman-0.2.5/util-str.c 2013-02-20 13:19:12.666727781 +0100
|
|
|
b5c7fc |
@@ -254,37 +254,31 @@ int substitute_string(char *dst, size_t
|
|
|
b5c7fc |
|
|
|
b5c7fc |
char * create_long_time_string(time_t t)
|
|
|
b5c7fc |
{
|
|
|
b5c7fc |
- char *p;
|
|
|
b5c7fc |
+ char buf[160];
|
|
|
b5c7fc |
struct tm tm;
|
|
|
b5c7fc |
- const int len = 25; /* YYYY-MM-DD HH:MM:SS ZONE + NUL */
|
|
|
b5c7fc |
|
|
|
b5c7fc |
- if (!(p = malloc(len))) {
|
|
|
b5c7fc |
- out_of_memory();
|
|
|
b5c7fc |
- }
|
|
|
b5c7fc |
get_localtime(&t, &tm;;
|
|
|
b5c7fc |
|
|
|
b5c7fc |
- if (strftime(p, len, "%Y-%m-%d %H:%M:%S %Z", &tm) == 0) {
|
|
|
b5c7fc |
+ if (strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S %Z", &tm) == 0) {
|
|
|
b5c7fc |
log_err(0, "strftime() failed");
|
|
|
b5c7fc |
+ buf[0] = '\0';
|
|
|
b5c7fc |
}
|
|
|
b5c7fc |
- return(p);
|
|
|
b5c7fc |
+ return(create_string(buf));
|
|
|
b5c7fc |
}
|
|
|
b5c7fc |
|
|
|
b5c7fc |
|
|
|
b5c7fc |
char * create_short_time_string(time_t t)
|
|
|
b5c7fc |
{
|
|
|
b5c7fc |
- char *p;
|
|
|
b5c7fc |
+ char buf[80];
|
|
|
b5c7fc |
struct tm tm;
|
|
|
b5c7fc |
- const int len = 12; /* MM-DD HH:MM + NUL */
|
|
|
b5c7fc |
|
|
|
b5c7fc |
- if (!(p = malloc(len))) {
|
|
|
b5c7fc |
- out_of_memory();
|
|
|
b5c7fc |
- }
|
|
|
b5c7fc |
get_localtime(&t, &tm;;
|
|
|
b5c7fc |
|
|
|
b5c7fc |
- if (strftime(p, len, "%m-%d %H:%M", &tm) == 0) {
|
|
|
b5c7fc |
+ if (strftime(buf, sizeof(buf), "%m-%d %H:%M", &tm) == 0) {
|
|
|
b5c7fc |
log_err(0, "strftime() failed");
|
|
|
b5c7fc |
+ buf[0] = '\0';
|
|
|
b5c7fc |
}
|
|
|
b5c7fc |
- return(p);
|
|
|
b5c7fc |
+ return(create_string(buf));
|
|
|
b5c7fc |
}
|
|
|
b5c7fc |
|
|
|
b5c7fc |
|