summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/uptime.c10
-rw-r--r--src/users.c6
-rw-r--r--src/who.c6
3 files changed, 11 insertions, 11 deletions
diff --git a/src/uptime.c b/src/uptime.c
index 2bf9a761f..8ff897e59 100644
--- a/src/uptime.c
+++ b/src/uptime.c
@@ -1,5 +1,5 @@
/* GNU's uptime.
- Copyright (C) 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+ Copyright (C) 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
#include <config.h>
#include <getopt.h>
-#include "system.h"
#include "error.h"
#include "readutmp.h"
+#include "system.h"
/* The name this program was run with. */
char *program_name;
@@ -66,7 +66,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
res = sscanf (buf, "%lf", &upsecs);
if (res == 1)
uptime = (time_t) upsecs;
- FCLOSE (fp);
+ fclose (fp);
}
#endif /* HAVE_PROC_UPTIME */
/* Loop through all the utmp entries we just read and count up the valid
@@ -122,7 +122,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
#endif
if (loads == -1)
- PUTCHAR ('\n');
+ putchar ('\n');
else
{
if (loads > 0)
@@ -132,7 +132,7 @@ print_uptime (int n, const STRUCT_UTMP *this)
if (loads > 2)
printf (", %.2f", avg[2]);
if (loads > 0)
- PUTCHAR ('\n');
+ putchar ('\n');
}
}
diff --git a/src/users.c b/src/users.c
index 0d44f6dcf..38eb6cd65 100644
--- a/src/users.c
+++ b/src/users.c
@@ -1,5 +1,5 @@
/* GNU's users.
- Copyright (C) 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+ Copyright (C) 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
#include <config.h>
#include <getopt.h>
-#include "system.h"
#include "error.h"
#include "readutmp.h"
+#include "system.h"
/* The name this program was run with. */
char *program_name;
@@ -82,7 +82,7 @@ list_entries_users (int n, const STRUCT_UTMP *this)
int c;
fputs (u[i], stdout);
c = (i < n_entries - 1 ? ' ' : '\n');
- PUTCHAR (c);
+ putchar (c);
}
for (i = 0; i < n_entries; i++)
diff --git a/src/who.c b/src/who.c
index 519327fe4..59f14290c 100644
--- a/src/who.c
+++ b/src/who.c
@@ -1,5 +1,5 @@
/* GNU's who.
- Copyright (C) 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+ Copyright (C) 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -27,9 +27,9 @@
#include <config.h>
#include <getopt.h>
-#include "system.h"
#include "error.h"
#include "readutmp.h"
+#include "system.h"
#ifndef MAXHOSTNAMELEN
# define MAXHOSTNAMELEN 64
@@ -202,7 +202,7 @@ print_entry (const STRUCT_UTMP *utmp_ent)
}
#endif
- PUTCHAR ('\n');
+ putchar ('\n');
}
/* Print the username of each valid entry and the number of valid entries