From 1dd9d13e214a631346f014b36c3f0c7deb10606f Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Sat, 9 May 2015 12:33:40 -0700 Subject: Convert all (remaining) uses of uint32/16/8 to _t in source3/printing. Signed-off-by: Richard Sharpe Reviewed-by: Jeremy Allison --- source3/printing/notify.c | 2 +- source3/printing/notify.h | 28 +++++++++---------- source3/printing/nt_printing.c | 2 +- source3/printing/print_cups.c | 2 +- source3/printing/printing.c | 62 ++++++++++++++++++++--------------------- source3/printing/printspoolss.c | 2 +- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/source3/printing/notify.c b/source3/printing/notify.c index c685363f32d..ec5f4705eb2 100644 --- a/source3/printing/notify.c +++ b/source3/printing/notify.c @@ -94,7 +94,7 @@ again: len += tdb_pack(buf + len, buflen - len, "f", msg->printer); len += tdb_pack(buf + len, buflen - len, "ddddddd", - (uint32)q->tv.tv_sec, (uint32)q->tv.tv_usec, + (uint32_t)q->tv.tv_sec, (uint32_t)q->tv.tv_usec, msg->type, msg->field, msg->id, msg->len, msg->flags); /* Pack data */ diff --git a/source3/printing/notify.h b/source3/printing/notify.h index f3b9fe4b33f..f64fab6243a 100644 --- a/source3/printing/notify.h +++ b/source3/printing/notify.h @@ -29,35 +29,35 @@ void print_notify_send_messages(struct messaging_context *msg_ctx, unsigned int timeout); void notify_printer_status_byname(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 status); + const char *sharename, uint32_t status); void notify_printer_status(struct tevent_context *ev, struct messaging_context *msg_ctx, - int snum, uint32 status); + int snum, uint32_t status); void notify_job_status_byname(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, - uint32 status, - uint32 flags); + const char *sharename, uint32_t jobid, + uint32_t status, + uint32_t flags); void notify_job_status(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, uint32 status); + const char *sharename, uint32_t jobid, uint32 status); void notify_job_total_bytes(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, - uint32 size); + const char *sharename, uint32_t jobid, + uint32_t size); void notify_job_total_pages(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, - uint32 pages); + const char *sharename, uint32_t jobid, + uint32_t pages); void notify_job_username(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, char *name); + const char *sharename, uint32_t jobid, char *name); void notify_job_name(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, char *name); + const char *sharename, uint32_t jobid, char *name); void notify_job_submitted(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *sharename, uint32 jobid, + const char *sharename, uint32_t jobid, time_t submitted); void notify_printer_driver(struct tevent_context *ev, struct messaging_context *msg_ctx, @@ -79,7 +79,7 @@ void notify_printer_location(struct tevent_context *ev, int snum, const char *location); void notify_printer_byname(struct tevent_context *ev, struct messaging_context *msg_ctx, - const char *printername, uint32 change, + const char *printername, uint32_t change, const char *value); void notify_printer_sepfile(struct tevent_context *ev, struct messaging_context *msg_ctx, diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 3d72c11fc9f..5b920518b56 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1900,7 +1900,7 @@ bool print_time_access_check(const struct auth_session_info *session_info, } t = gmtime(&now); - mins = (uint32)t->tm_hour*60 + (uint32)t->tm_min; + mins = (uint32_t)t->tm_hour*60 + (uint32)t->tm_min; if (mins >= pinfo2->starttime && mins <= pinfo2->untiltime) { ok = True; diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index fd78a7ff1c4..3ebb2e67ab2 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -498,7 +498,7 @@ struct cups_async_cb_args { static void cups_async_callback(struct tevent_context *event_ctx, struct tevent_fd *event, - uint16 flags, + uint16_t flags, void *p) { TALLOC_CTX *frame = talloc_stackframe(); diff --git a/source3/printing/printing.c b/source3/printing/printing.c index 668c76f132c..0328e744ca5 100644 --- a/source3/printing/printing.c +++ b/source3/printing/printing.c @@ -93,7 +93,7 @@ uint16_t pjobid_to_rap(const char* sharename, uint32_t jobid) key.dsize = sizeof(jinfo); data = tdb_fetch(rap_tdb, key); - if (data.dptr && data.dsize == sizeof(uint16)) { + if (data.dptr && data.dsize == sizeof(uint16_t)) { rap_jobid = SVAL(data.dptr, 0); SAFE_FREE(data.dptr); DEBUG(10,("pjobid_to_rap: jobid %u maps to RAP jobid %u\n", @@ -168,7 +168,7 @@ void rap_jobid_delete(const char* sharename, uint32_t jobid) key.dsize = sizeof(jinfo); data = tdb_fetch(rap_tdb, key); - if (!data.dptr || (data.dsize != sizeof(uint16))) { + if (!data.dptr || (data.dsize != sizeof(uint16_t))) { DEBUG(10,("rap_jobid_delete: cannot find jobid %u\n", (unsigned int)jobid )); SAFE_FREE(data.dptr); @@ -519,7 +519,7 @@ static int sysjob_to_jobid_traverse_fn(TDB_CONTEXT *the_tdb, TDB_DATA key, return 0; pjob = (struct printjob *)data.dptr; - if (key.dsize != sizeof(uint32)) + if (key.dsize != sizeof(uint32_t)) return 0; if (state->sysjob == pjob->sysjob) { @@ -569,7 +569,7 @@ uint32_t sysjob_to_jobid(int unix_jobid) if (state.jobid != (uint32_t)-1) return state.jobid; } - return (uint32)-1; + return (uint32_t)-1; } /* find sysjob based on spoolss jobid */ @@ -798,7 +798,7 @@ static bool pjob_store(struct tevent_context *ev, TDB_DATA old_data, new_data; bool ret = False; struct tdb_print_db *pdb = get_print_db_byname(sharename); - uint8 *buf = NULL; + uint8_t *buf = NULL; int len, newlen, buflen; @@ -817,16 +817,16 @@ static bool pjob_store(struct tevent_context *ev, len = 0; buflen = newlen; len += tdb_pack(buf+len, buflen-len, "ddddddddddfffff", - (uint32)pjob->pid, - (uint32)pjob->jobid, - (uint32)pjob->sysjob, - (uint32)pjob->fd, - (uint32)pjob->starttime, - (uint32)pjob->status, - (uint32)pjob->size, - (uint32)pjob->page_count, - (uint32)pjob->spooled, - (uint32)pjob->smbjob, + (uint32_t)pjob->pid, + (uint32_t)pjob->jobid, + (uint32_t)pjob->sysjob, + (uint32_t)pjob->fd, + (uint32_t)pjob->starttime, + (uint32_t)pjob->status, + (uint32_t)pjob->size, + (uint32_t)pjob->page_count, + (uint32_t)pjob->spooled, + (uint32_t)pjob->smbjob, pjob->filename, pjob->jobname, pjob->user, @@ -956,7 +956,7 @@ static void print_unix_job(struct tevent_context *ev, return; } - if (jobid == (uint32)-1) { + if (jobid == (uint32_t)-1) { jobid = q->sysjob + UNIX_JOB_START; } @@ -1269,12 +1269,12 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct qcount++; data.dsize += tdb_pack(NULL, 0, "ddddddff", - (uint32)queue[i].sysjob, - (uint32)queue[i].size, - (uint32)queue[i].page_count, - (uint32)queue[i].status, - (uint32)queue[i].priority, - (uint32)queue[i].time, + (uint32_t)queue[i].sysjob, + (uint32_t)queue[i].size, + (uint32_t)queue[i].page_count, + (uint32_t)queue[i].status, + (uint32_t)queue[i].priority, + (uint32_t)queue[i].time, queue[i].fs_user, queue[i].fs_file); } @@ -1289,12 +1289,12 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct continue; len += tdb_pack(data.dptr + len, data.dsize - len, "ddddddff", - (uint32)queue[i].sysjob, - (uint32)queue[i].size, - (uint32)queue[i].page_count, - (uint32)queue[i].status, - (uint32)queue[i].priority, - (uint32)queue[i].time, + (uint32_t)queue[i].sysjob, + (uint32_t)queue[i].size, + (uint32_t)queue[i].page_count, + (uint32_t)queue[i].status, + (uint32_t)queue[i].priority, + (uint32_t)queue[i].time, queue[i].fs_user, queue[i].fs_file); } @@ -1466,7 +1466,7 @@ static void print_queue_update_internal(struct tevent_context *ev, for (i=0; i