aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include/os.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-01-06 03:19:01 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:47 -0500
commit7eebe8a9c51686927709a57b1f2725d371014abc (patch)
tree6b1543982c8656c76c25baa7e44497d5d9de307a /arch/um/include/os.h
parent2264c475e4bf7427e59921953c89a5693ecb506f (diff)
[PATCH] uml: umid cleanup
This patch cleans up the umid code: - The only_if_set argument to get_umid is gone. - get_umid returns an empty string rather than NULL if there is no umid. - umid_is_random is gone since its users went away. - Some printfs were turned into printks because the code runs late enough that printk is working. - Error paths were cleaned up. - Some functions now return an error and let the caller print the error message rather than printing it themselves. This eliminates the practice of passing a pointer to printf or printk in, depending on where in the boot process we are. - Major tidying of not_dead_yet - mostly error path cleanup, plus a comment explaining why it doesn't react to errors the way you might expect. - Calls to os_* interfaces that were moved under os are changed back to their native libc forms. - snprintf, strlcpy, and their bounds-checking friends are used more often, replacing by-hand bounds checking in some places. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/include/os.h')
-rw-r--r--arch/um/include/os.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 258444e5b9bc..c279ee6d89e4 100644
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -216,7 +216,7 @@ extern int helper_wait(int pid);
216/* umid.c */ 216/* umid.c */
217 217
218extern int umid_file_name(char *name, char *buf, int len); 218extern int umid_file_name(char *name, char *buf, int len);
219extern int set_umid(char *name, int (*printer)(const char *fmt, ...)); 219extern int set_umid(char *name);
220extern char *get_umid(int only_if_set); 220extern char *get_umid(void);
221 221
222#endif 222#endif