File checkinstall-codecleanup.patch of Package checkinstall
--- installwatch-0.7.0beta5/installwatch.c
+++ installwatch-0.7.0beta5/installwatch.c
@@ -253,7 +253,7 @@
;
*/
-static inline int log(const char *format,...)
+static inline int logg(const char *format,...)
#ifdef __GNUC__
/* Tell gcc that this function behaves like printf()
* for parameters 1 and 2 */
@@ -418,7 +418,7 @@
}
*/
-static inline int log(const char *format,...) {
+static inline int logg(const char *format,...) {
char *logname;
va_list ap;
int rcod;
@@ -871,8 +871,8 @@
"\td_type : %d\n"
"\td_name : \"%.*s\"\n",
entry,
- entry->d_ino,
- entry->d_off,
+ (long long)entry->d_ino,
+ (long long)entry->d_off,
entry->d_reclen,
(int)entry->d_type,
(int)entry->d_reclen,(char*)(entry->d_name)
@@ -1384,7 +1384,7 @@
*/
static int instw_setpath(instw_t *instw,const char *path) {
size_t relen;
- size_t trlen;
+ size_t trlen = 0;
size_t melen;
#if DEBUG
@@ -2136,7 +2136,7 @@
instw_apply(&instw);
result = true_chmod(instw.translpath, mode);
- log("%d\tchmod\t%s\t0%04o\t#%s\n",result,
+ logg("%d\tchmod\t%s\t0%04o\t#%s\n",result,
instw.reslvpath,mode,error(result));
instw_delete(&instw);
@@ -2175,7 +2175,7 @@
instw_apply(&instw);
result=true_chown(instw.translpath,owner,group);
- log("%d\tchown\t%s\t%d\t%d\t#%s\n",result,
+ logg("%d\tchown\t%s\t%d\t%d\t#%s\n",result,
instw.reslvpath,owner,group,error(result));
instw_delete(&instw);
@@ -2202,7 +2202,7 @@
* From now on, another log file will be written if
* INSTW_LOGFILE is set
*/
- log("%d\tchroot\t%s\t#%s\n", result, canonic, error(result));
+ logg("%d\tchroot\t%s\t#%s\n", result, canonic, error(result));
return result;
}
@@ -2238,7 +2238,7 @@
instw_apply(&instw);
result = true_open(instw.translpath,O_CREAT|O_WRONLY|O_TRUNC,mode);
- log("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2258,7 +2258,7 @@
#endif
result = true_fchmod(filedes, mode);
- log("%d\tfchmod\t%d\t0%04o\t#%s\n",result,filedes,mode,error(result));
+ logg("%d\tfchmod\t%d\t0%04o\t#%s\n",result,filedes,mode,error(result));
return result;
}
@@ -2275,13 +2275,13 @@
#endif
result = true_fchown(fd, owner, group);
- log("%d\tfchown\t%d\t%d\t%d\t#%s\n",result,fd,owner,group,error(result));
+ logg("%d\tfchown\t%d\t%d\t%d\t#%s\n",result,fd,owner,group,error(result));
return result;
}
#if !defined(__s390_glibc_bug_) && !defined(__powerpc_glibc_bug_)
FILE *fopen(const char *pathname, const char *mode) {
- FILE *result;
+ FILE *result = (FILE *)0;
instw_t instw;
int status=0;
@@ -2311,7 +2311,7 @@
REFCOUNT;
backup(instw.truepath);
instw_apply(&instw);
- log("%d\tfopen\t%s\t#%s\n",(int)result,
+ logg("%ld\tfopen\t%s\t#%s\n",(long)result,
instw.reslvpath,error(result));
}
@@ -2326,7 +2326,7 @@
}
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+')
- log("%d\tfopen\t%s\t#%s\n",(int)result,
+ logg("%ld\tfopen\t%s\t#%s\n",(long)result,
instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2348,7 +2348,7 @@
#endif
result = true_ftruncate(fd, length);
- log("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
+ logg("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
return result;
}
@@ -2448,7 +2448,7 @@
instw_apply(&instw);
result=true_lchown(instw.translpath,owner,group);
- log("%d\tlchown\t%s\t%d\t%d\t#%s\n",result,
+ logg("%d\tlchown\t%s\t%d\t%d\t#%s\n",result,
instw.reslvpath,owner,group,error(result));
instw_delete(&instw);
@@ -2492,7 +2492,7 @@
instw_apply(&instw_n);
result=true_link(instw_o.translpath,instw_n.translpath);
- log("%d\tlink\t%s\t%s\t#%s\n",result,
+ logg("%d\tlink\t%s\t%s\t#%s\n",result,
instw_o.reslvpath,instw_n.reslvpath,error(result));
instw_delete(&instw_o);
@@ -2531,7 +2531,7 @@
instw_apply(&instw);
result=true_mkdir(instw.translpath,mode);
- log("%d\tmkdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tmkdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2569,7 +2569,7 @@
backup(instw.truepath);
result=true_xmknod(version,instw.translpath,mode,dev);
- log("%d\tmknod\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tmknod\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2624,7 +2624,7 @@
result=true_open(instw.path,flags,mode);
if(flags & (O_WRONLY | O_RDWR))
- log("%d\topen\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\topen\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2784,7 +2784,7 @@
instw_apply(&newinstw);
result=true_rename(oldinstw.translpath,newinstw.translpath);
- log("%d\trename\t%s\t%s\t#%s\n",result,
+ logg("%d\trename\t%s\t%s\t#%s\n",result,
oldinstw.reslvpath,newinstw.reslvpath,error(result));
instw_delete(&oldinstw);
@@ -2820,7 +2820,7 @@
instw_apply(&instw);
result=true_rmdir(instw.translpath);
- log("%d\trmdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\trmdir\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -2969,7 +2969,7 @@
instw_apply(&instw_slink);
result=true_symlink(pathname,instw_slink.translpath);
- log("%d\tsymlink\t%s\t%s\t#%s\n",
+ logg("%d\tsymlink\t%s\t%s\t#%s\n",
result,instw.path,instw_slink.reslvpath,error(result));
@@ -3010,7 +3010,7 @@
instw_apply(&instw);
result=true_truncate(instw.translpath,length);
- log("%d\ttruncate\t%s\t%d\t#%s\n",result,
+ logg("%d\ttruncate\t%s\t%d\t#%s\n",result,
instw.reslvpath,(int)length,error(result));
instw_delete(&instw);
@@ -3049,7 +3049,7 @@
instw_apply(&instw);
result=true_unlink(instw.translpath);
- log("%d\tunlink\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tunlink\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3085,7 +3085,7 @@
instw_apply(&instw);
result=true_utime(instw.translpath,newtimes);
- log("%d\tutime\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tutime\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3121,7 +3121,7 @@
instw_apply(&instw);
result=true_utimes(instw.translpath,newtimes);
- log("%d\tutimes\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tutimes\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3157,7 +3157,7 @@
instw_apply(&instw);
result=true_access(instw.translpath,type);
- log("%d\taccess\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\taccess\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3198,7 +3198,7 @@
instw_apply(&instw);
result=true_open64(instw.translpath,O_CREAT | O_WRONLY | O_TRUNC, mode);
- log("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
+ logg("%d\tcreat\t%s\t#%s\n",result,instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3218,7 +3218,7 @@
#endif
result = true_ftruncate64(fd, length);
- log("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
+ logg("%d\tftruncate\t%d\t%d\t#%s\n",result,fd,(int)length,error(result));
return result;
}
@@ -3266,7 +3266,7 @@
}
if(mode[0]=='w'||mode[0]=='a'||mode[1]=='+')
- log("%d\tfopen64\t%s\t#%s\n",(int)result,
+ logg("%ld\tfopen64\t%s\t#%s\n",(long)result,
instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3326,7 +3326,7 @@
}
if(flags & (O_WRONLY | O_RDWR))
- log("%d\topen\t%s\t#%s\n",result,
+ logg("%d\topen\t%s\t#%s\n",result,
instw.reslvpath,error(result));
instw_delete(&instw);
@@ -3497,7 +3497,7 @@
result=true_truncate64(instw.translpath,length);
- log("%d\ttruncate\t%s\t%d\t#%s\n",result,
+ logg("%d\ttruncate\t%s\t%d\t#%s\n",result,
instw.reslvpath,(int)length,error(result));
instw_delete(&instw);
--- installwatch-0.7.0beta5/test-installwatch.c
+++ installwatch-0.7.0beta5/test-installwatch.c
@@ -21,6 +21,7 @@
#include <fcntl.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
