From 28e2781568934b9fe4ebab76d8ebc31f77c0f337 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Fri, 29 May 2009 15:10:31 -0700 Subject: Run Nindent on com32/rosh/rosh.h Automatically reformat com32/rosh/rosh.h using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin --- com32/rosh/rosh.h | 86 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) (limited to 'com32') diff --git a/com32/rosh/rosh.h b/com32/rosh/rosh.h index d7296e1a..64b0564c 100644 --- a/com32/rosh/rosh.h +++ b/com32/rosh/rosh.h @@ -28,15 +28,15 @@ #include #include -#include /* macro: true false */ -#include /* strcpy() strlen() memcpy() strchr() */ +#include /* macro: true false */ +#include /* strcpy() strlen() memcpy() strchr() */ #include -#include /* fstat() */ -#include /* open(); open mode macros */ -#include /* fdopendir() opendir() readdir() closedir() DIR */ -#include /* getcwd() */ -#include /* errno; error macros */ -#include /* For htonl/ntohl/htons/ntohs */ +#include /* fstat() */ +#include /* open(); open mode macros */ +#include /* fdopendir() opendir() readdir() closedir() DIR */ +#include /* getcwd() */ +#include /* errno; error macros */ +#include /* For htonl/ntohl/htons/ntohs */ #include #include @@ -45,19 +45,19 @@ /* Plus, there seem to be other references for SYSLINUX to __GNUC__ */ #ifndef __GNUC__ #error SYSLINUX (I believe) requires __GNUC__ -#endif /* __GNUC__ */ +#endif /* __GNUC__ */ #ifdef DO_DEBUG #define ROSH_DEBUG(f, ...) printf (f, ## __VA_ARGS__) #ifdef DO_DEBUG2 #define ROSH_DEBUG2(f, ...) printf (f, ## __VA_ARGS__) -#else /* DO_DEBUG2 */ +#else /* DO_DEBUG2 */ #define ROSH_DEBUG2(f, ...) ((void)0) -#endif /* DO_DEBUG2 */ -#else /* DO_DEBUG */ +#endif /* DO_DEBUG2 */ +#else /* DO_DEBUG */ #define ROSH_DEBUG(f, ...) ((void)0) #define ROSH_DEBUG2(f, ...) ((void)0) -#endif /* DO_DEBUG */ +#endif /* DO_DEBUG */ #ifdef __COM32__ #define ROSH_IS_COM32 1 @@ -70,37 +70,39 @@ #define ROSH_IS_COM32 0 static inline char *syslinux_config_file() { - return ""; + return ""; } + static inline int getscreensize(int fd, int *rows, int *cols) { - char *str; - int rv; - *rows = 0; - *cols = 0; - if (rows) { - str = getenv("LINES"); - if (str) { - *rows = atoi(str); - } + char *str; + int rv; + *rows = 0; + *cols = 0; + if (rows) { + str = getenv("LINES"); + if (str) { + *rows = atoi(str); } - if (cols) { - str = getenv("COLUMNS"); - if (str) { - *cols = atoi(str); - } + } + if (cols) { + str = getenv("COLUMNS"); + if (str) { + *cols = atoi(str); } - if (!rows || !cols) - rv = -1; - else if (!*rows || !*cols) - rv = -2; - else - rv = 0; - return rv; + } + if (!rows || !cols) + rv = -1; + else if (!*rows || !*cols) + rv = -2; + else + rv = 0; + return rv; } + #define ROSH_COM32(f, ...) ((void)0) #define syslinux_run_command(f) ((void)0) -#endif /* __COM32__ */ +#endif /* __COM32__ */ #define SEP '/' @@ -117,8 +119,8 @@ static inline int getscreensize(int fd, int *rows, int *cols) #define ROSH_CMD_SZ COMMAND_LINE_SIZE #else #define ROSH_CMD_SZ 2048 -#endif /* COMMAND_LINE_SIZE */ -#endif /* MAX_CMDLINE_LEN */ +#endif /* COMMAND_LINE_SIZE */ +#endif /* MAX_CMDLINE_LEN */ /* Size of path buffer string */ #ifdef PATH_MAX @@ -127,13 +129,13 @@ static inline int getscreensize(int fd, int *rows, int *cols) #define ROSH_PATH_SZ NAME_MAX #else #define ROSH_PATH_SZ 255 -#endif /* NAME_MAX */ +#endif /* NAME_MAX */ const char rosh_help_str1[] = -"Commands: ? cat cd cfg dir exit help less ls man more pwd run quit ver"; + "Commands: ? cat cd cfg dir exit help less ls man more pwd run quit ver"; const char rosh_help_str2[] = -"Commands: (some 1-letter abreviations also allowed)\n\ + "Commands: (some 1-letter abreviations also allowed)\n\ h HELP\n ALSO ? help man\n\ cat Concatenate file to console\n cat \n\ cd Change to directory \n cd \n\ @@ -145,4 +147,4 @@ const char rosh_help_str2[] = run Run a program/kernel with options\n\ exit Exit to previous environment\n ALSO quit"; -#endif /* Not ROSH_H */ +#endif /* Not ROSH_H */ -- cgit