wok-6.x annotate partimage/stuff/partimage-0.6.7_gcc4.u @ rev 11557

Add matchbox-panel-2 form wok-undigest
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Dec 25 15:19:10 2011 +0100 (2011-12-25)
parents ab3be1ac9c50
children
rev   line source
erjo@4229 1 --- partimage-0.6.7-ori/src/client/main.cpp Sun Feb 3 21:58:00 2008
erjo@4229 2 +++ partimage-0.6.7/src/client/main.cpp Thu Sep 24 12:03:23 2009
erjo@4229 3 @@ -26,9 +26,11 @@
erjo@4229 4 #include <sys/param.h>
erjo@4229 5 #endif
erjo@4229 6
erjo@4229 7 +
erjo@4229 8 #include <stdlib.h>
erjo@4229 9 #include <stdio.h>
erjo@4229 10 #include <unistd.h>
erjo@4229 11 +#include <cstdlib>
erjo@4229 12
erjo@4229 13 #define __STDC_FORMAT_MACROS
erjo@4229 14 #include <inttypes.h>
erjo@4266 15 --- partimage-0.6.7-ori/src/client/misc.cpp Sun Feb 3 21:58:00 2008
erjo@4266 16 +++ partimage-0.6.7/src/client/misc.cpp Fri Sep 25 15:14:39 2009
erjo@4266 17 @@ -24,6 +24,7 @@
erjo@4266 18 #include <unistd.h>
erjo@4266 19 #define __STDC_FORMAT_MACROS
erjo@4266 20 #include <inttypes.h>
erjo@4266 21 +#include <cstring>
erjo@4266 22
erjo@4266 23 #ifdef HAVE_SYS_PARAM_H
erjo@4266 24 #include <sys/param.h>
erjo@4266 25 @@ -2372,7 +2373,7 @@
erjo@4266 26
erjo@4266 27 static char *sfdisk_line_to_partition_device(const char *line)
erjo@4266 28 {
erjo@4266 29 - if (char *p = strchr(line, ':')) {
erjo@4266 30 + if (const char *p = strchr(line, ':')) {
erjo@4266 31 while (p[-1] == ' ' && p > line) p--;
erjo@4266 32 return strndup(line, p - line);
erjo@4266 33 } else {
erjo@4229 34 --- partimage-0.6.7-ori/src/server/partimaged-main.cpp Sun Feb 3 21:57:53 2008
erjo@4229 35 +++ partimage-0.6.7/src/server/partimaged-main.cpp Thu Sep 24 10:31:42 2009
erjo@4229 36 @@ -27,7 +27,7 @@
erjo@4229 37
erjo@4229 38 #include <stdio.h>
erjo@4229 39 #include <stdlib.h>
erjo@4229 40 -#include <iostream.h>
erjo@4229 41 +#include <iostream>
erjo@4229 42 #include <sys/types.h>
erjo@4229 43 #include <sys/stat.h>
erjo@4229 44 #include <signal.h>
erjo@4229 45 --- partimage-0.6.7-ori/src/server/partimaged.cpp Sun Feb 3 21:57:53 2008
erjo@4229 46 +++ partimage-0.6.7/src/server/partimaged.cpp Thu Sep 24 10:32:08 2009
erjo@4229 47 @@ -22,7 +22,7 @@
erjo@4229 48
erjo@4229 49 #include <stdio.h>
erjo@4229 50 #include <stdlib.h>
erjo@4229 51 -#include <iostream.h>
erjo@4229 52 +#include <iostream>
erjo@4229 53
erjo@4229 54 #include "net.h"
erjo@4229 55 #include "netserver.h"
erjo@4229 56 --- partimage-0.6.7-ori/src/shared/net.h Sun Feb 3 21:57:55 2008
erjo@4229 57 +++ partimage-0.6.7/src/shared/net.h Thu Sep 24 10:32:35 2009
erjo@4229 58 @@ -28,7 +28,7 @@
erjo@4229 59 #include <sys/types.h>
erjo@4229 60 #include <sys/socket.h>
erjo@4229 61 #include <arpa/inet.h>
erjo@4229 62 -#include <iostream.h>
erjo@4229 63 +#include <iostream>
erjo@4229 64 #include <pthread.h>
erjo@4229 65
erjo@4229 66 #include "pathnames.h"