From 2f4eea30c3b292921d02d35ebcdb37b53b60c6a0 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 6 Apr 2006 16:19:10 +0000
Subject: [PATCH] Change some jobid.stepid print formats from %d to %u.
---
src/sacct/options.c | 18 +++++++++---------
src/sacct/print.c | 2 +-
src/sacct/process.c | 12 ++++++------
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 9264c7f2fd1..99bc87ab484 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -121,7 +121,7 @@ int _cmp_jrec(const void *a1, const void *a2) {
*/
void _dump_header(acct_header_t header)
{
- printf("%d %s %d %d %d %d %s %s ",
+ printf("%u %s %d %d %d %d %s %s ",
header.jobnum,
header.partition,
(int)header.job_start,
@@ -1011,7 +1011,7 @@ void do_dump(void)
if (params.opt_verbose > 1)
fprintf(stderr,
"Note: Skipping older"
- " job %d dated %d\n",
+ " job %u dated %d\n",
job->header.jobnum,
(int)job->header.job_start);
continue;
@@ -1026,7 +1026,7 @@ void do_dump(void)
* job was probably canceled. */
fprintf(stderr,
"Error: No JOB_START record for "
- "job %d\n",
+ "job %u\n",
job->header.jobnum);
}
_dump_header(job->header);
@@ -1046,7 +1046,7 @@ void do_dump(void)
step->exitcode=1;
}
_dump_header(step->header);
- printf("JOB_STEP %d %s %s ",
+ printf("JOB_STEP %u %s %s ",
step->stepnum,
step->stepname,
step->nodes);
@@ -1582,7 +1582,7 @@ void do_list(void)
if (params.opt_verbose > 1)
fprintf(stderr,
"Note: Skipping older"
- " job %d dated %d\n",
+ " job %u dated %d\n",
job->header.jobnum,
(int)job->header.job_start);
continue;
@@ -1591,7 +1591,7 @@ void do_list(void)
/* If we only saw JOB_TERMINATED, the job was
* probably canceled. */
fprintf(stderr,
- "Error: No JOB_START record for job %d\n",
+ "Error: No JOB_START record for job %u\n",
job->header.jobnum);
if (rc<ERROR)
rc = ERROR;
@@ -1600,17 +1600,17 @@ void do_list(void)
if (!job->job_start_seen)
fprintf(stderr,
"Note: No JOB_START record for "
- "job %d\n",
+ "job %u\n",
job->header.jobnum);
if (!job->job_step_seen)
fprintf(stderr,
"Note: No JOB_STEP record for "
- "job %d\n",
+ "job %u\n",
job->header.jobnum);
if (!job->job_terminated_seen)
fprintf(stderr,
"Note: No JOB_TERMINATED record for "
- "job %d\n",
+ "job %u\n",
job->header.jobnum);
}
if (params.opt_uid >= 0 && (job->header.uid != params.opt_uid))
diff --git a/src/sacct/print.c b/src/sacct/print.c
index 5d5beacef0e..ad26054c8c9 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -355,7 +355,7 @@ void print_step(type_t type, void *object)
printf("%-10d", job->header.jobnum);
break;
case JOBSTEP:
- snprintf(outbuf, sizeof(outbuf), "%d.%d",
+ snprintf(outbuf, sizeof(outbuf), "%u.%u",
step->header.jobnum,
step->stepnum);
printf("%-10s", outbuf);
diff --git a/src/sacct/process.c b/src/sacct/process.c
index c738884e544..4750ca31816 100644
--- a/src/sacct/process.c
+++ b/src/sacct/process.c
@@ -214,7 +214,7 @@ void process_start(char *f[], int lc)
job = _find_job_record(temp->header);
if (job) { /* Hmmm... that's odd */
fprintf(stderr,
- "Conflicting JOB_START for job %d at"
+ "Conflicting JOB_START for job %u at"
" line %d -- ignoring it\n",
job->header.jobnum, lc);
input_error++;
@@ -257,7 +257,7 @@ void process_step(char *f[], int lc)
if ((params.opt_verbose > 1)
&& (params.opt_jobstep_list==NULL))
fprintf(stderr,
- "Note: JOB_STEP record %d.%d preceded "
+ "Note: JOB_STEP record %u.%u preceded "
"JOB_START record at line %d\n",
temp->header.jobnum, temp->stepnum, lc);
}
@@ -270,7 +270,7 @@ void process_step(char *f[], int lc)
if (step->status != JOB_RUNNING) { /* if not JOB_RUNNING */
fprintf(stderr,
"Conflicting JOB_STEP record for "
- "jobstep %d.%d at line %d "
+ "jobstep %u.%u at line %d "
"-- ignoring it\n",
step->header.jobnum,
step->stepnum, lc);
@@ -380,7 +380,7 @@ void process_terminated(char *f[], int lc)
job = _init_job_rec(temp->header, lc);
if (params.opt_verbose > 1)
fprintf(stderr, "Note: JOB_TERMINATED record for job "
- "%d preceded "
+ "%u preceded "
"other job records at line %d\n",
temp->header.jobnum, lc);
} else if (job->job_terminated_seen) {
@@ -389,7 +389,7 @@ void process_terminated(char *f[], int lc)
if (params.opt_verbose > 1)
fprintf(stderr,
"Note: Duplicate JOB_TERMINATED "
- "record (nf) for job %d at "
+ "record (nf) for job %u at "
"line %d\n",
temp->header.jobnum, lc);
/* JOB_TERMINATED/NF records may be preceded
@@ -402,7 +402,7 @@ void process_terminated(char *f[], int lc)
fprintf(stderr,
"Conflicting JOB_TERMINATED record (%s) for "
- "job %d at line %d -- ignoring it\n",
+ "job %u at line %d -- ignoring it\n",
decode_status_int(temp->status),
job->header.jobnum, lc);
input_error++;
--
GitLab