about summary refs log tree commit diff
path: root/sysdeps/gnu/bits
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/gnu/bits')
-rw-r--r--sysdeps/gnu/bits/utmp.h46
-rw-r--r--sysdeps/gnu/bits/utmpx.h23
2 files changed, 30 insertions, 39 deletions
diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
index 163f6427ec..6a0beb61a9 100644
--- a/sysdeps/gnu/bits/utmp.h
+++ b/sysdeps/gnu/bits/utmp.h
@@ -17,7 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _UTMP_H
-#error "Never use <bits/utmp.h> directly; include <utmpx.h> instead."
+# error "Never include <bits/utmp.h> directly; use <utmpx.h> instead."
 #endif
 
 #include <paths.h>
@@ -33,38 +33,38 @@
 /* The structure describing an entry in the database of
    previous logins.  */
 struct lastlog
-{
-  time_t ll_time;
-  char ll_line[UT_LINESIZE];
-  char ll_host[UT_HOSTSIZE];
-};
+  {
+    __time_t ll_time;
+    char ll_line[UT_LINESIZE];
+    char ll_host[UT_HOSTSIZE];
+  };
 
 
 /* The structure describing the status of a terminated process.  This
    type is used in `struct utmp' below.  */
 struct exit_status
-{
-  short int e_termination;	/* Process termination status.  */
-  short int e_exit;		/* Process exit status.  */
-};
+  {
+    short int e_termination;	/* Process termination status.  */
+    short int e_exit;		/* Process exit status.  */
+  };
 
 
 /* The structure describing an entry in the user accounting database.  */
 struct utmp
-{
-  short int ut_type;		/* Type of login.  */
-  pid_t ut_pid;			/* Process ID of login process.  */
-  char ut_line[UT_LINESIZE];	/* Devicename.  */
-  char ut_id[4];		/* Inittab ID.  */
-  char ut_user[UT_NAMESIZE];	/* Username.  */
-  char ut_host[UT_HOSTSIZE];	/* Hostname for remote login.  */
-  struct exit_status ut_exit;	/* Exit status of a process marked
+  {
+    short int ut_type;		/* Type of login.  */
+    pid_t ut_pid;		/* Process ID of login process.  */
+    char ut_line[UT_LINESIZE];	/* Devicename.  */
+    char ut_id[4];		/* Inittab ID.  */
+    char ut_user[UT_NAMESIZE];	/* Username.  */
+    char ut_host[UT_HOSTSIZE];	/* Hostname for remote login.  */
+    struct exit_status ut_exit;	/* Exit status of a process marked
 				   as DEAD_PROCESS.  */
-  long ut_session;		/* Session ID, used for windowing.  */
-  struct timeval ut_tv;		/* Time entry was made.  */
-  int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char pad[20];			/* Reserved for future use.  */
-};
+    long ut_session;		/* Session ID, used for windowing.  */
+    struct timeval ut_tv;	/* Time entry was made.  */
+    int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
+    char pad[20];		/* Reserved for future use.  */
+  };
 
 /* Backwards compatibility hacks.  */
 #define ut_name		ut_user
diff --git a/sysdeps/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
index 4f1a876d0a..4ecbb3a026 100644
--- a/sysdeps/gnu/bits/utmpx.h
+++ b/sysdeps/gnu/bits/utmpx.h
@@ -1,6 +1,5 @@
 /* Structures and defenitions for the user accounting database.  GNU version.
    Copyright (C) 1997 Free Software Foundation, Inc.
-   Contributed by Mark Kettenis <kettenis@phys.uva.nl>, 1997.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -18,7 +17,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _UTMPX_H
-#error "Never use <bits/utmpx.h> directly; include <utmpx.h> instead."
+# error "Never include <bits/utmpx.h> directly; use <utmpx.h> instead."
 #endif
 
 #include <bits/types.h>
@@ -29,14 +28,14 @@
 #define __UT_NAMESIZE	32
 #define __UT_HOSTSIZE	256
 
-   
+
 /* The structure describing the status of a terminated process.  This
    type is used in `struct utmpx' below.  */
 struct __exit_status
-{
-  short int e_termination;	/* Process termination status.  */
-  short int e_exit;		/* Process exit status.  */
-};
+  {
+    short int e_termination;	/* Process termination status.  */
+    short int e_exit;		/* Process exit status.  */
+  };
 
 
 /* The structure describing an entry in the user accounting database.  */
@@ -50,7 +49,7 @@ struct utmpx
   char ut_host[__UT_HOSTSIZE];	/* Hostname for remote login.  */
   struct __exit_status ut_exit;	/* Exit status of a process marked
 				   as DEAD_PROCESS.  */
-  long ut_session;		/* Session ID, used for windowing.  */
+  long int ut_session;		/* Session ID, used for windowing.  */
   struct timeval ut_tv;		/* Time entry was made.  */
   __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
   char pad[20];			/* Reserved for future use.  */
@@ -69,11 +68,3 @@ struct utmpx
 #define LOGIN_PROCESS	6	/* Session leader of a logged in user.  */
 #define USER_PROCESS	7	/* Normal process.  */
 #define DEAD_PROCESS	8	/* Terminated process.  */
-
-
-
-
-
-
-
-