diff options
author | Bastien Nocera <hadess@src.gnome.org> | 2003-10-20 20:12:28 +0000 |
---|---|---|
committer | Bastien Nocera <hadess@src.gnome.org> | 2003-10-20 20:12:28 +0000 |
commit | b2283f7c79c0291901c1ea616190e4befd544767 (patch) | |
tree | 04903a09dccb331aa177e589cfe83b30578f62bf /include/glibtop | |
parent | adc9a5557816fe47e3b70cb6543fcc3895eaed7b (diff) | |
download | libgtop-b2283f7c79c0291901c1ea616190e4befd544767.tar.gz |
- s/u_int64_t/guint64/
Diffstat (limited to 'include/glibtop')
34 files changed, 50 insertions, 50 deletions
diff --git a/include/glibtop/array.h b/include/glibtop/array.h index 1259d27b..4d557365 100644 --- a/include/glibtop/array.h +++ b/include/glibtop/array.h @@ -41,7 +41,7 @@ typedef struct _glibtop_array glibtop_array; struct _glibtop_array { - u_int64_t flags, + guint64 flags, number, /* GLIBTOP_ARRAY_NUMBER */ size, /* GLIBTOP_ARRAY_SIZE */ total; /* GLIBTOP_ARRAY_TOTAL */ diff --git a/include/glibtop/command.h b/include/glibtop/command.h index ca5139ff..d6219133 100644 --- a/include/glibtop/command.h +++ b/include/glibtop/command.h @@ -69,8 +69,8 @@ typedef union _glibtop_response_union glibtop_response_union; struct _glibtop_command { - u_int64_t command; - u_int64_t size, data_size; + guint64 command; + guint64 size, data_size; char parameter [_GLIBTOP_PARAM_SIZE]; }; @@ -83,7 +83,7 @@ union _glibtop_response_union struct _glibtop_response { int64_t offset; - u_int64_t size, data_size; + guint64 size, data_size; glibtop_response_union u; }; diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index 799ce3db..cbe081e7 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -51,7 +51,7 @@ typedef struct _glibtop_cpu glibtop_cpu; struct _glibtop_cpu { - u_int64_t flags, + guint64 flags, total, /* GLIBTOP_CPU_TOTAL */ user, /* GLIBTOP_CPU_USER */ nice, /* GLIBTOP_CPU_NICE */ diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h index e3ba7772..ab695639 100644 --- a/include/glibtop/fsusage.h +++ b/include/glibtop/fsusage.h @@ -41,7 +41,7 @@ typedef struct _glibtop_fsusage glibtop_fsusage; struct _glibtop_fsusage { - u_int64_t flags, + guint64 flags, blocks, /* Total blocks. */ bfree, /* Free blocks available to superuser. */ bavail, /* Free blocks available to non-superuser. */ diff --git a/include/glibtop/glibtop-backend-info.h b/include/glibtop/glibtop-backend-info.h index 71bd119d..786545ab 100644 --- a/include/glibtop/glibtop-backend-info.h +++ b/include/glibtop/glibtop-backend-info.h @@ -40,7 +40,7 @@ typedef struct _glibtop_backend_module glibtop_backend_module; typedef struct _glibtop_call_vector glibtop_call_vector; typedef int (*glibtop_backend_open_func_t) (glibtop_server *, glibtop_backend *, - u_int64_t, const char **); + guint64, const char **); typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *, glibtop_closure *); diff --git a/include/glibtop/glibtop-backend.h b/include/glibtop/glibtop-backend.h index 90cc5355..63c58cd0 100644 --- a/include/glibtop/glibtop-backend.h +++ b/include/glibtop/glibtop-backend.h @@ -65,7 +65,7 @@ GType glibtop_backend_get_type (void); glibtop_backend * -glibtop_backend_get (const char *backend_name, u_int64_t features, +glibtop_backend_get (const char *backend_name, guint64 features, const char **backend_args, GError **error); void diff --git a/include/glibtop/glibtop-client.h b/include/glibtop/glibtop-client.h index 74de1b7b..e389653e 100644 --- a/include/glibtop/glibtop-client.h +++ b/include/glibtop/glibtop-client.h @@ -82,7 +82,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error); void glibtop_client_open_backend (glibtop_client *client, const char *backend_name, - u_int64_t features, const char **backend_args); + guint64 features, const char **backend_args); void glibtop_client_add_backend (glibtop_client *client, diff --git a/include/glibtop/inodedb.h b/include/glibtop/inodedb.h index ed0343b6..7ce5640d 100644 --- a/include/glibtop/inodedb.h +++ b/include/glibtop/inodedb.h @@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key glibtop_inodedb_key; struct _glibtop_inodedb_key { - u_int64_t device, inode; + guint64 device, inode; }; struct _glibtop_inodedb @@ -57,7 +57,7 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache const char * glibtop_inodedb_lookup_s (glibtop *server, glibtop_inodedb *inodedb, - u_int64_t device, u_int64_t inode); + guint64 device, guint64 inode); void glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb); diff --git a/include/glibtop/interfaces.h b/include/glibtop/interfaces.h index f9cd4d4c..9999c1a2 100644 --- a/include/glibtop/interfaces.h +++ b/include/glibtop/interfaces.h @@ -151,17 +151,17 @@ enum _glibtop_interface_flags { struct _glibtop_ifaddr { - u_int64_t flags, + guint64 flags, transport; /* GLIBTOP_IFADDR_TRANSPORT */ u_int8_t addr_len, /* GLIBTOP_IFADDR_ADDR_LEN */ address [GLIBTOP_IFADDR_LEN]; /* GLIBTOP_IFADDR_ADDRESS */ - u_int64_t subnet, /* GLIBTOP_IFADDR_SUBNET */ + guint64 subnet, /* GLIBTOP_IFADDR_SUBNET */ scope; /* GLIBTOP_IFADDR_SCOPE */ }; struct _glibtop_interface { - u_int64_t flags, + guint64 flags, if_flags, /* GLIBTOP_INTERFACE_IF_FLAGS */ transport, /* GLIBTOP_INTERFACE_TRANSPORT */ type, /* GLIBTOP_INTERFACE_TYPE */ @@ -177,14 +177,14 @@ struct _glibtop_interface #define glibtop_get_interface_names_r glibtop_get_interface_names_s #endif -glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy); +glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy); #if GLIBTOP_SUID_INTERFACE_NAMES int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure); -glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy); +glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy); #else int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure); -glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy); +glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/limits.h b/include/glibtop/limits.h index b939feff..03450f6e 100644 --- a/include/glibtop/limits.h +++ b/include/glibtop/limits.h @@ -45,8 +45,8 @@ G_BEGIN_DECLS /* Length of a network interface address in bytes. */ #define GLIBTOP_IFADDR_LEN 16 -/* This is ((u_int64_t)-1) */ -#define GLIBTOP_UNLIMITED (~(u_int64_t)0) +/* This is ((guint64)-1) */ +#define GLIBTOP_UNLIMITED (~(guint64)0) /* Maximum length of a backend name. */ #define GLIBTOP_BACKEND_NAME_LEN 40 diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index ed3f9f61..3f1c86f8 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -40,9 +40,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg; struct _glibtop_loadavg { - u_int64_t flags; + guint64 flags; double loadavg [3]; /* GLIBTOP_LOADAVG_LOADAVG */ - u_int64_t nr_running, /* GLIBTOP_LOADAVG_NR_RUNNING */ + guint64 nr_running, /* GLIBTOP_LOADAVG_NR_RUNNING */ nr_tasks, /* GLIBTOP_LOADAVG_NR_TASKS */ last_pid; /* GLIBTOP_LOADAVG_LAST_PID */ }; diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h index 8fe5090a..7dd9c4fb 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -44,7 +44,7 @@ typedef struct _glibtop_mem glibtop_mem; struct _glibtop_mem { - u_int64_t flags, + guint64 flags, total, /* GLIBTOP_MEM_TOTAL */ used, /* GLIBTOP_MEM_USED */ free, /* GLIBTOP_MEM_FREE */ diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index bebbd317..e52fb57d 100644 --- a/include/glibtop/mountlist.h +++ b/include/glibtop/mountlist.h @@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist glibtop_mountlist; struct _glibtop_mountentry { - u_int64_t dev; + guint64 dev; char devname [GLIBTOP_MOUNTENTRY_LEN+1]; char mountdir [GLIBTOP_MOUNTENTRY_LEN+1]; char type [GLIBTOP_MOUNTENTRY_LEN+1]; @@ -49,7 +49,7 @@ struct _glibtop_mountentry struct _glibtop_mountlist { - u_int64_t flags, + guint64 flags, number, /* GLIBTOP_MOUNTLIST_NUMBER */ total, /* GLIBTOP_MOUNTLIST_TOTAL */ size; /* GLIBTOP_MOUNTLIST_SIZE */ diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h index 9b2a2111..d6f5c48f 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -43,7 +43,7 @@ typedef struct _glibtop_msg_limits glibtop_msg_limits; struct _glibtop_msg_limits { - u_int64_t flags, + guint64 flags, msgpool, /* GLIBTOP_IPC_MSGPOOL */ msgmap, /* GLIBTOP_IPC_MSGMAP */ msgmax, /* GLIBTOP_IPC_MSGMAX */ diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h index d36fcf57..0296f710 100644 --- a/include/glibtop/netinfo.h +++ b/include/glibtop/netinfo.h @@ -45,7 +45,7 @@ typedef struct _glibtop_netinfo glibtop_netinfo; struct _glibtop_netinfo { - u_int64_t flags, + guint64 flags, if_flags, /* GLIBTOP_NETINFO_IF_FLAGS */ transport, /* GLIBTOP_NETINFO_TRANSPORT */ mtu; /* GLIBTOP_NETINFO_MTU */ @@ -57,14 +57,14 @@ struct _glibtop_netinfo #define glibtop_get_netinfo_r glibtop_get_netinfo_s #endif -glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); +glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); #if GLIBTOP_SUID_NETINFO int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure); -glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); +glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); #else int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure); -glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport); +glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); #endif #ifdef GLIBTOP_NAMES diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h index 7e1548ca..d4eb7a59 100644 --- a/include/glibtop/netload.h +++ b/include/glibtop/netload.h @@ -69,7 +69,7 @@ enum { struct _glibtop_netload { - u_int64_t flags, + guint64 flags, if_flags, /* GLIBTOP_NETLOAD_IF_FLAGS */ mtu, /* GLIBTOP_NETLOAD_MTU */ subnet, /* GLIBTOP_NETLOAD_SUBNET */ diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h index a9f66fff..9fab24f7 100644 --- a/include/glibtop/ppp.h +++ b/include/glibtop/ppp.h @@ -45,7 +45,7 @@ enum { struct _glibtop_ppp { - u_int64_t flags, + guint64 flags, state, /* GLIBTOP_PPP_STATE */ bytes_in, /* GLIBTOP_PPP_BYTES_IN */ bytes_out; /* GLIBTOP_PPP_BYTES_OUT */ diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h index ea275c48..8571c20e 100644 --- a/include/glibtop/procargs.h +++ b/include/glibtop/procargs.h @@ -37,7 +37,7 @@ typedef struct _glibtop_proc_args glibtop_proc_args; struct _glibtop_proc_args { - u_int64_t flags, + guint64 flags, size; /* GLIBTOP_PROC_ARGS_SIZE */ }; diff --git a/include/glibtop/proccwd.h b/include/glibtop/proccwd.h index ac32cc35..840c1a9e 100644 --- a/include/glibtop/proccwd.h +++ b/include/glibtop/proccwd.h @@ -45,7 +45,7 @@ typedef struct _glibtop_proc_cwd glibtop_proc_cwd; struct _glibtop_proc_cwd { - u_int64_t flags, + guint64 flags, size, device, inode; diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h index 7f9f9d4b..30786a74 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -47,8 +47,8 @@ typedef struct _glibtop_proc_kernel glibtop_proc_kernel; struct _glibtop_proc_kernel { - u_int64_t flags; - u_int64_t k_flags, /* kernel flags for the process */ + guint64 flags; + guint64 k_flags, /* kernel flags for the process */ min_flt, /* number of minor page faults since * process start */ maj_flt, /* number of major page faults since diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 8a53e35a..3b9d1d76 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -56,7 +56,7 @@ typedef struct _glibtop_proclist glibtop_proclist; struct _glibtop_proclist { - u_int64_t flags, + guint64 flags, number, /* GLIBTOP_PROCLIST_NUMBER */ total, /* GLIBTOP_PROCLIST_TOTAL */ size; /* GLIBTOP_PROCLIST_SIZE */ diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index d5f0fab6..1f04b1a6 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -59,13 +59,13 @@ typedef struct _glibtop_proc_map glibtop_proc_map; struct _glibtop_map_entry { - u_int64_t flags, start, end, offset, perm, inode, device; + guint64 flags, start, end, offset, perm, inode, device; char filename [GLIBTOP_MAP_FILENAME_LEN+1]; }; struct _glibtop_proc_map { - u_int64_t flags, + guint64 flags, number, /* GLIBTOP_PROC_MAP_NUMBER */ total, /* GLIBTOP_PROC_MAP_TOTAL */ size; /* GLIBTOP_PROC_MAP_SIZE */ diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h index 8adcb9fb..ceb44d33 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -44,7 +44,7 @@ typedef struct _glibtop_proc_mem glibtop_proc_mem; struct _glibtop_proc_mem { - u_int64_t flags, + guint64 flags, size, /* total # of pages of memory */ vsize, /* number of pages of virtual memory ... */ resident, /* number of resident set diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h index 8e7c254a..7ad3bc4b 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -46,7 +46,7 @@ typedef struct _glibtop_proc_segment glibtop_proc_segment; struct _glibtop_proc_segment { - u_int64_t flags, + guint64 flags, text_rss, /* text resident set size */ shlib_rss, /* shared-lib resident set size */ data_rss, /* data resident set size */ diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h index d7880550..9498e93d 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -42,7 +42,7 @@ typedef struct _glibtop_proc_signal glibtop_proc_signal; struct _glibtop_proc_signal { - u_int64_t flags, + guint64 flags, signal [2], /* mask of pending signals */ blocked [2], /* mask of blocked signals */ sigignore [2], /* mask of ignored signals */ diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h index 5687b523..6decb2df 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -42,7 +42,7 @@ typedef struct _glibtop_proc_state glibtop_proc_state; struct _glibtop_proc_state { - u_int64_t flags; + guint64 flags; char cmd[40], /* basename of executable file in * call to exec(2) */ state; /* single-char code for process state diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h index e49c1d1f..b4c50368 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -50,7 +50,7 @@ typedef struct _glibtop_proc_time glibtop_proc_time; struct _glibtop_proc_time { - u_int64_t flags, + guint64 flags, start_time, /* start time of process -- * seconds since 1-1-70 */ rtime, /* real time accumulated by process */ diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h index 3c6ea123..d5bccd63 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -50,7 +50,7 @@ typedef struct _glibtop_proc_uid glibtop_proc_uid; struct _glibtop_proc_uid { - u_int64_t flags; + guint64 flags; int uid, /* user id */ euid, /* effective user id */ gid, /* group id */ diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h index 047ac083..ab9a28b3 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -46,7 +46,7 @@ typedef struct _glibtop_sem_limits glibtop_sem_limits; struct _glibtop_sem_limits { - u_int64_t flags, + guint64 flags, semmap, /* GLIBTOP_IPC_SEMMAP */ semmni, /* GLIBTOP_IPC_SEMMNI */ semmns, /* GLIBTOP_IPC_SEMMNS */ diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index 14499823..9b1a5c57 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -41,7 +41,7 @@ typedef struct _glibtop_shm_limits glibtop_shm_limits; struct _glibtop_shm_limits { - u_int64_t flags, + guint64 flags, shmmax, /* GLIBTOP_IPC_SHMMAX */ shmmin, /* GLIBTOP_IPC_SHMMIN */ shmmni, /* GLIBTOP_IPC_SHMMNI */ diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h index ab3c0a76..8e03c96b 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -41,7 +41,7 @@ typedef struct _glibtop_swap glibtop_swap; struct _glibtop_swap { - u_int64_t flags, + guint64 flags, total, /* GLIBTOP_SWAP_TOTAL */ used, /* GLIBTOP_SWAP_USED */ free, /* GLIBTOP_SWAP_FREE */ diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h index 56f0a781..11d2f9c3 100644 --- a/include/glibtop/sysdeps.h +++ b/include/glibtop/sysdeps.h @@ -64,7 +64,7 @@ typedef struct _glibtop_sysdeps glibtop_sysdeps; struct _glibtop_sysdeps { - u_int64_t flags, + guint64 flags, features, /* server features */ cpu, /* glibtop_cpu */ mem, /* glibtop_mem */ diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h index 591b7e20..3db74033 100644 --- a/include/glibtop/sysinfo.h +++ b/include/glibtop/sysinfo.h @@ -49,7 +49,7 @@ struct _glibtop_entry struct _glibtop_sysinfo { - u_int64_t flags, ncpu; + guint64 flags, ncpu; glibtop_entry cpuinfo [GLIBTOP_NCPU]; }; diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 0eedf726..5f7f2199 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -38,7 +38,7 @@ typedef struct _glibtop_uptime glibtop_uptime; struct _glibtop_uptime { - u_int64_t flags; + guint64 flags; double uptime, /* GLIBTOP_UPTIME_UPTIME */ idletime; /* GLIBTOP_UPTIME_IDLETIME */ }; |