moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

code cleanup (mainly removed line spaces at the beginning of lines by tabulations)

Browse Source
This commit is contained in:
Aurelien Foret 2006-01-07 09:42:48 +00:00
parent 6c3657b702
commit f3a4197e34
10 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libalpm/util.c
View File

@ -328,8 +328,10 @@ int _alpm_log_action(unsigned char usesyslog, FILE *f, char *fmt, ...)
t = time(NULL); t = time(NULL);
tm = localtime(&t); tm = localtime(&t);
fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n", tm->tm_mon+1, tm->tm_mday, fprintf(f, "[%02d/%02d/%02d %02d:%02d] %s\n",
tm->tm_year-100, tm->tm_hour, tm->tm_min, msg); tm->tm_mon+1, tm->tm_mday, tm->tm_year-100,
tm->tm_hour, tm->tm_min,
msg);
} }
return(0); return(0);

2
src/pacman/util.c
View File

@ -79,7 +79,6 @@ int rmrf(char *path)
int errflag = 0; int errflag = 0;
struct dirent *dp; struct dirent *dp;
DIR *dirp; DIR *dirp;
char name[PATH_MAX];
if(!unlink(path)) { if(!unlink(path)) {
return(0); return(0);
@ -102,6 +101,7 @@ int rmrf(char *path)
} }
for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) { for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
if(dp->d_ino) { if(dp->d_ino) {
char name[PATH_MAX];
sprintf(name, "%s/%s", path, dp->d_name); sprintf(name, "%s/%s", path, dp->d_name);
if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) { if(strcmp(dp->d_name, "..") && strcmp(dp->d_name, ".")) {
errflag += rmrf(name); errflag += rmrf(name);

13
src/pacman/util.h
View File

@ -21,10 +21,17 @@
#ifndef _PM_UTIL_H #ifndef _PM_UTIL_H
#define _PM_UTIL_H #define _PM_UTIL_H
#define MALLOC(p, b) do { if((b) > 0) { \ #define MALLOC(p, b) do { \
p = malloc(b); if (!(p)) { \ if((b) > 0) { \
p = malloc(b); \
if (!(p)) { \
fprintf(stderr, "malloc failure: could not allocate %d bytes\n", b); \ fprintf(stderr, "malloc failure: could not allocate %d bytes\n", b); \
exit(1); }} else p = NULL; } while(0) exit(1); \
} \
} else { \
p = NULL; \
} \
} while(0)
#define FREE(p) do { if (p) { free(p); (p) = NULL; }} while(0) #define FREE(p) do { if (p) { free(p); (p) = NULL; }} while(0)