Add flow-tools from #1341
git-svn-id: svn://svn.openwrt.org/openwrt/packages@7248 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
41
net/flow-tools/patches/050-fix-64bit_temp_time_t.patch
Normal file
41
net/flow-tools/patches/050-fix-64bit_temp_time_t.patch
Normal file
@ -0,0 +1,41 @@
|
||||
diff --git a/lib/ftfile.c b/lib/ftfile.c
|
||||
index f25e849..ec17771 100644
|
||||
--- a/lib/ftfile.c
|
||||
+++ b/lib/ftfile.c
|
||||
@@ -413,16 +413,17 @@ void ftfile_pathname(char *buf, int bsiz
|
||||
int done, u_int32 ftime)
|
||||
{
|
||||
struct tm *tm;
|
||||
+ time_t _t = (time_t) ftime;
|
||||
char *prefix, dbuf[64];
|
||||
long gmt_val;
|
||||
char gmt_sign;
|
||||
int tm_gmtoff;
|
||||
|
||||
- if (!(tm = localtime ((time_t*)&ftime))) {
|
||||
+ if (!(tm = localtime (&_t))) {
|
||||
snprintf(buf, bsize, ".");
|
||||
}
|
||||
|
||||
- tm_gmtoff = get_gmtoff(ftime);
|
||||
+ tm_gmtoff = get_gmtoff(_t);
|
||||
|
||||
/* compute GMT offset */
|
||||
if (tm_gmtoff >= 0) {
|
||||
@@ -502,6 +503,7 @@ void ftfile_pathname(char *buf, int bsiz
|
||||
int ftfile_mkpath(u_int32 ftime, int nest)
|
||||
{
|
||||
struct tm *tm;
|
||||
+ time_t _t = (time_t) ftime;
|
||||
char buf[32];
|
||||
|
||||
/* no directories */
|
||||
@@ -512,7 +514,7 @@ int ftfile_mkpath(u_int32 ftime, int nes
|
||||
if ((nest > 3) || (nest < -3))
|
||||
return -1;
|
||||
|
||||
- if (!(tm = localtime ((time_t*)&ftime)))
|
||||
+ if (!(tm = localtime (&_t)))
|
||||
return -1;
|
||||
|
||||
if (nest == -1)
|
Reference in New Issue
Block a user