top(1): style(9)

- split return type from function name
- Sprinkle a __pure where possible.

usr.bin/top/display.c

@@ -160,7 +160,8 @@ display_resize(void)
     return(smart_terminal ? lines : Largest);
 }
 
-int display_updatecpus(struct statics *statics)
+int
+display_updatecpus(struct statics *statics)
 {
     int lines;
     int i;
@@ -184,7 +185,8 @@ int display_updatecpus(struct statics *statics)
     return(lines);
 }
 
-int display_init(struct statics * statics)
+int
+display_init(struct statics * statics)
 {
     int lines;
     char **pp;
@@ -1074,7 +1076,8 @@ readline(char *buffer, int size, int numeric)
 
 /* internal support routines */
 
-static void summary_format(char *str, int *numbers, const char * const *names)
+static void
+summary_format(char *str, int *numbers, const char * const *names)
 {
     char *p;
     int num;

usr.bin/top/username.c

@@ -55,7 +55,8 @@ struct hash_el {
 static struct hash_el hash_table[Table_size];
 
 
-char *username(int uid)
+char *
+username(int uid)
 {
     int hashindex;
 
@@ -68,7 +69,8 @@ char *username(int uid)
     return(hash_table[hashindex].name);
 }
 
-int userid(char username[])
+int
+userid(char username[])
 {
     struct passwd *pwd;
 
@@ -89,7 +91,8 @@ int userid(char username[])
 }
 
 /* wecare 1 = enter it always, 0 = nice to have */
-int enter_user(int uid, char name[], bool wecare)
+int
+enter_user(int uid, char name[], bool wecare)
 {
     int hashindex;
 

usr.bin/top/utils.c

@@ -122,7 +122,7 @@ digits(int val)
  * string_index(string, array) - find string in array and return index
  */
 
-int
+int __pure
 string_index(const char *string, const char * const *array)
 {
     size_t i = 0;
@@ -175,7 +175,7 @@ argparse(char *line, int *cntp)
  *	useful on for calculating cpu state percentages.
  */
 
-long
+long __pure
 percentages(int cnt, int *out, long *new, long *old, long *diffs)
 {
     int i;