Convert all uint32/16/8 to _t in a grab-bag of remaining files.

[vlendec/samba-autobuild/.git] / source3 / utils / net_rap.c

diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index d5b78fc99c19c5c280c38fe55a7e388340671e87..96703e438ca8d9a77b2f44a42e4510a69e3d2d09 100644 (file)
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -53,15 +53,15 @@ int net_rap_file_usage(struct net_context *c, int argc, const char **argv)
 /***************************************************************************
   list info on an open file
 ***************************************************************************/
-static void file_fn(const char * pPath, const char * pUser, uint16 perms,
-                   uint16 locks, uint32 id)
+static void file_fn(const char * pPath, const char * pUser, uint16_t perms,
+                   uint16_t locks, uint32_t id)
 {
        d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
                 id, pUser, perms, locks, pPath);
 }
 
-static void one_file_fn(const char *pPath, const char *pUser, uint16 perms,
-                       uint16 locks, uint32 id)
+static void one_file_fn(const char *pPath, const char *pUser, uint16_t perms,
+                       uint16_t locks, uint32_t id)
 {
        d_printf(_("File ID          %d\n"
                   "User name        %s\n"
@@ -196,14 +196,14 @@ int net_rap_share_usage(struct net_context *c, int argc, const char **argv)
        return net_share_usage(c, argc, argv);
 }
 
-static void long_share_fn(const char *share_name, uint32 type,
+static void long_share_fn(const char *share_name, uint32_t type,
                          const char *comment, void *state)
 {
        d_printf("%-12s %-8.8s %-50s\n",
                 share_name, net_share_type_str(type), comment);
 }
 
-static void share_fn(const char *share_name, uint32 type,
+static void share_fn(const char *share_name, uint32_t type,
                     const char *comment, void *state)
 {
        d_printf("%s\n", share_name);
@@ -348,9 +348,9 @@ int net_rap_session_usage(struct net_context *c, int argc, const char **argv)
        return -1;
 }
 
-static void list_sessions_func(char *wsname, char *username, uint16 conns,
-                       uint16 opens, uint16 users, uint32 sess_time,
-                       uint32 idle_time, uint32 user_flags, char *clitype)
+static void list_sessions_func(char *wsname, char *username, uint16_t conns,
+                       uint16_t opens, uint16_t users, uint32_t sess_time,
+                       uint32_t idle_time, uint32_t user_flags, char *clitype)
 {
        int hrs = idle_time / 3600;
        int min = (idle_time / 60) % 60;
@@ -361,9 +361,9 @@ static void list_sessions_func(char *wsname, char *username, uint16 conns,
 }
 
 static void display_session_func(const char *wsname, const char *username,
-                                uint16 conns, uint16 opens, uint16 users,
-                                uint32 sess_time, uint32 idle_time,
-                                uint32 user_flags, const char *clitype)
+                                uint16_t conns, uint16_t opens, uint16_t users,
+                                uint32_t sess_time, uint32_t idle_time,
+                                uint32_t user_flags, const char *clitype)
 {
        int ihrs = idle_time / 3600;
        int imin = (idle_time / 60) % 60;
@@ -382,8 +382,8 @@ static void display_session_func(const char *wsname, const char *username,
                 shrs, smin, ssec, ihrs, imin, isec);
 }
 
-static void display_conns_func(uint16 conn_id, uint16 conn_type, uint16 opens,
-                              uint16 users, uint32 conn_time,
+static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16_t opens,
+                              uint16_t users, uint32_t conn_time,
                               const char *username, const char *netname)
 {
        d_printf("%-14.14s %-8.8s %5d\n",
@@ -496,7 +496,7 @@ int net_rap_session(struct net_context *c, int argc, const char **argv)
 /****************************************************************************
 list a server name
 ****************************************************************************/
-static void display_server_func(const char *name, uint32 m,
+static void display_server_func(const char *name, uint32_t m,
                                const char *comment, void * reserved)
 {
        d_printf("\t%-16.16s     %s\n", name, comment);
@@ -634,10 +634,10 @@ int net_rap_printq_usage(struct net_context *c, int argc, const char **argv)
        return -1;
 }
 
-static void enum_queue(const char *queuename, uint16 pri, uint16 start,
-                      uint16 until, const char *sep, const char *pproc,
+static void enum_queue(const char *queuename, uint16_t pri, uint16_t start,
+                      uint16_t until, const char *sep, const char *pproc,
                       const char *dest, const char *qparms,
-                      const char *qcomment, uint16 status, uint16 jobcount)
+                      const char *qcomment, uint16_t status, uint16_t jobcount)
 {
        d_printf(_("%-17.17s Queue %5d jobs                      "),
                 queuename, jobcount);
@@ -660,9 +660,9 @@ static void enum_queue(const char *queuename, uint16 pri, uint16 start,
        }
 }
 
-static void enum_jobs(uint16 jobid, const char *ownername,
+static void enum_jobs(uint16_t jobid, const char *ownername,
                      const char *notifyname, const char *datatype,
-                     const char *jparms, uint16 pos, uint16 status,
+                     const char *jparms, uint16_t pos, uint16_t status,
                      const char *jstatus, unsigned int submitted, unsigned int jobsize,
                      const char *comment)
 {