wok-next diff partimage/stuff/partimage-0.6.7_gcc4.u @ rev 6418
Up: homebank to 4.3.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sun Sep 26 16:07:07 2010 +0000 (2010-09-26) |
parents | ab3be1ac9c50 |
children |
line diff
1.1 --- a/partimage/stuff/partimage-0.6.7_gcc4.u Thu Sep 24 12:41:52 2009 +0000 1.2 +++ b/partimage/stuff/partimage-0.6.7_gcc4.u Sun Sep 26 16:07:07 2010 +0000 1.3 @@ -12,6 +12,25 @@ 1.4 1.5 #define __STDC_FORMAT_MACROS 1.6 #include <inttypes.h> 1.7 +--- partimage-0.6.7-ori/src/client/misc.cpp Sun Feb 3 21:58:00 2008 1.8 ++++ partimage-0.6.7/src/client/misc.cpp Fri Sep 25 15:14:39 2009 1.9 +@@ -24,6 +24,7 @@ 1.10 + #include <unistd.h> 1.11 + #define __STDC_FORMAT_MACROS 1.12 + #include <inttypes.h> 1.13 ++#include <cstring> 1.14 + 1.15 + #ifdef HAVE_SYS_PARAM_H 1.16 + #include <sys/param.h> 1.17 +@@ -2372,7 +2373,7 @@ 1.18 + 1.19 + static char *sfdisk_line_to_partition_device(const char *line) 1.20 + { 1.21 +- if (char *p = strchr(line, ':')) { 1.22 ++ if (const char *p = strchr(line, ':')) { 1.23 + while (p[-1] == ' ' && p > line) p--; 1.24 + return strndup(line, p - line); 1.25 + } else { 1.26 --- partimage-0.6.7-ori/src/server/partimaged-main.cpp Sun Feb 3 21:57:53 2008 1.27 +++ partimage-0.6.7/src/server/partimaged-main.cpp Thu Sep 24 10:31:42 2009 1.28 @@ -27,7 +27,7 @@