aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:36 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-29 15:10:36 -0700
commitee99a386d95c36b8bed14d001441c059f9094262 (patch)
treebf7c0f1cb3b9eeb37fac5ce7be608297ac39ee17
parent19346b78495e5315cd4bdcbceb600196e55d6a70 (diff)
downloadsyslinux.git-ee99a386d95c36b8bed14d001441c059f9094262.tar.gz
syslinux.git-ee99a386d95c36b8bed14d001441c059f9094262.tar.xz
syslinux.git-ee99a386d95c36b8bed14d001441c059f9094262.zip
Run Nindent on memdump/argv.c
Automatically reformat memdump/argv.c using Nindent. Do this for all files except HDT, gPXE and externally maintained libraries (zlib, tinyjpeg, libpng). Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--memdump/argv.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/memdump/argv.c b/memdump/argv.c
index a8c98742..ca41e036 100644
--- a/memdump/argv.c
+++ b/memdump/argv.c
@@ -38,55 +38,55 @@
#define ALIGN_UP(p,t) ((t *)(((uintptr_t)(p) + (sizeof(t)-1)) & ~(sizeof(t)-1)))
-extern char _end[]; /* Symbol created by linker */
-void *__mem_end = &_end; /* Global variable for use by malloc() */
+extern char _end[]; /* Symbol created by linker */
+void *__mem_end = &_end; /* Global variable for use by malloc() */
int __parse_argv(char ***argv, const char *str)
{
- char *mem = __mem_end;
- const char *p = str;
- char *q = mem;
- char *r;
- char **arg;
- int wasspace = 0;
- int argc = 1;
+ char *mem = __mem_end;
+ const char *p = str;
+ char *q = mem;
+ char *r;
+ char **arg;
+ int wasspace = 0;
+ int argc = 1;
- /* First copy the string, turning whitespace runs into nulls */
- for ( p = str ; ; p++ ) {
- if ( *p <= ' ' ) {
- if ( !wasspace ) {
- wasspace = 1;
- *q++ = '\0';
- }
- } else {
- if ( wasspace ) {
- argc++;
- wasspace = 0;
- }
- *q++ = *p;
- }
+ /* First copy the string, turning whitespace runs into nulls */
+ for (p = str;; p++) {
+ if (*p <= ' ') {
+ if (!wasspace) {
+ wasspace = 1;
+ *q++ = '\0';
+ }
+ } else {
+ if (wasspace) {
+ argc++;
+ wasspace = 0;
+ }
+ *q++ = *p;
+ }
- /* This test is AFTER we have processed the null byte;
- we treat it as a whitespace character so it terminates
- the last argument */
- if ( ! *p )
- break;
- }
+ /* This test is AFTER we have processed the null byte;
+ we treat it as a whitespace character so it terminates
+ the last argument */
+ if (!*p)
+ break;
+ }
- /* Now create argv */
- arg = ALIGN_UP(q,char *);
- *argv = arg;
- *arg++ = mem; /* argv[0] */
+ /* Now create argv */
+ arg = ALIGN_UP(q, char *);
+ *argv = arg;
+ *arg++ = mem; /* argv[0] */
- q--; /* Point q to final null */
- for ( r = mem ; r < q ; r++ ) {
- if ( *r == '\0' ) {
- *arg++ = r+1;
+ q--; /* Point q to final null */
+ for (r = mem; r < q; r++) {
+ if (*r == '\0') {
+ *arg++ = r + 1;
+ }
}
- }
- *arg++ = NULL; /* Null pointer at the end */
- __mem_end = arg; /* End of memory we used */
+ *arg++ = NULL; /* Null pointer at the end */
+ __mem_end = arg; /* End of memory we used */
- return argc;
+ return argc;
}