undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dp/pid-uintmax'

Browse Source 
* dp/pid-uintmax:
  cast pid_t's to uintmax_t to improve portability
This commit is contained in:
Junio C Hamano 2008-09-02 17:45:25 -07:00
commit 14e8607c41
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-commit.c
View File

@ -320,7 +320,7 @@ static char *prepare_index(int argc, const char **argv, const char *prefix)
die("unable to write new_index file"); die("unable to write new_index file");
fd = hold_lock_file_for_update(&false_lock, fd = hold_lock_file_for_update(&false_lock,
git_path("next-index-%d", getpid()), 1); git_path("next-index-%"PRIuMAX, (uintmax_t) getpid()), 1);
create_base_index(); create_base_index();
add_remove_files(&partial); add_remove_files(&partial);

2
builtin-fetch-pack.c
View File

@ -540,7 +540,7 @@ static int get_pack(int xd[2], char **pack_lockfile)
*av++ = "--fix-thin"; *av++ = "--fix-thin";
if (args.lock_pack || unpack_limit) { if (args.lock_pack || unpack_limit) {
int s = sprintf(keep_arg, int s = sprintf(keep_arg,
"--keep=fetch-pack %d on ", getpid()); "--keep=fetch-pack %"PRIuMAX " on ", (uintmax_t) getpid());
if (gethostname(keep_arg + s, sizeof(keep_arg) - s)) if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
strcpy(keep_arg + s, "localhost"); strcpy(keep_arg + s, "localhost");
*av++ = keep_arg; *av++ = keep_arg;

6
daemon.c
View File

@ -86,7 +86,7 @@ static void logreport(int priority, const char *err, va_list params)
* Since stderr is set to linebuffered mode, the * Since stderr is set to linebuffered mode, the
* logging of different processes will not overlap * logging of different processes will not overlap
*/ */
fprintf(stderr, "[%d] ", (int)getpid()); fprintf(stderr, "[%"PRIuMAX"] ", (uintmax_t)getpid());
vfprintf(stderr, err, params); vfprintf(stderr, err, params);
fputc('\n', stderr); fputc('\n', stderr);
} }
@ -658,7 +658,7 @@ static void check_dead_children(void)
remove_child(pid); remove_child(pid);
if (!WIFEXITED(status) || (WEXITSTATUS(status) > 0)) if (!WIFEXITED(status) || (WEXITSTATUS(status) > 0))
dead = " (with error)"; dead = " (with error)";
loginfo("[%d] Disconnected%s", (int)pid, dead); loginfo("[%"PRIuMAX"] Disconnected%s", (uintmax_t)pid, dead);
} }
} }
@ -923,7 +923,7 @@ static void store_pid(const char *path)
FILE *f = fopen(path, "w"); FILE *f = fopen(path, "w");
if (!f) if (!f)
die("cannot open pid file %s: %s", path, strerror(errno)); die("cannot open pid file %s: %s", path, strerror(errno));
if (fprintf(f, "%d\n", getpid()) < 0 || fclose(f) != 0) if (fprintf(f, "%"PRIuMAX"\n", (uintmax_t) getpid()) < 0 || fclose(f) != 0)
die("failed to write pid file %s: %s", path, strerror(errno)); die("failed to write pid file %s: %s", path, strerror(errno));
} }

6
fast-import.c
View File

@ -376,7 +376,7 @@ static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
static void write_crash_report(const char *err) static void write_crash_report(const char *err)
{ {
char *loc = git_path("fast_import_crash_%d", getpid()); char *loc = git_path("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
FILE *rpt = fopen(loc, "w"); FILE *rpt = fopen(loc, "w");
struct branch *b; struct branch *b;
unsigned long lu; unsigned long lu;
@ -390,8 +390,8 @@ static void write_crash_report(const char *err)
fprintf(stderr, "fast-import: dumping crash report to %s\n", loc); fprintf(stderr, "fast-import: dumping crash report to %s\n", loc);
fprintf(rpt, "fast-import crash report:\n"); fprintf(rpt, "fast-import crash report:\n");
fprintf(rpt, " fast-import process: %d\n", getpid()); fprintf(rpt, " fast-import process: %"PRIuMAX"\n", (uintmax_t) getpid());
fprintf(rpt, " parent process : %d\n", getppid()); fprintf(rpt, " parent process : %"PRIuMAX"\n", (uintmax_t) getppid());
fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL)); fprintf(rpt, " at %s\n", show_date(time(NULL), 0, DATE_LOCAL));
fputc('\n', rpt); fputc('\n', rpt);

2
receive-pack.c
View File

@ -407,7 +407,7 @@ static const char *unpack(void)
char keep_arg[256]; char keep_arg[256];
struct child_process ip; struct child_process ip;
s = sprintf(keep_arg, "--keep=receive-pack %i on ", getpid()); s = sprintf(keep_arg, "--keep=receive-pack %"PRIuMAX" on ", (uintmax_t) getpid());
if (gethostname(keep_arg + s, sizeof(keep_arg) - s)) if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
strcpy(keep_arg + s, "localhost"); strcpy(keep_arg + s, "localhost");