Jim Meyering
2009-Nov-19 10:39 UTC
[Libguestfs] [PATCH libguestfs] syntax-check: expand TABs in generator.ml
>From 6f128e90afb055f9899011c4a592eb289e678936 Mon Sep 17 00:00:00 2001From: Jim Meyering <meyering at redhat.com> Date: Thu, 19 Nov 2009 11:39:10 +0100 Subject: [PATCH libguestfs] syntax-check: expand TABs in generator.ml * src/generator.ml: Expand leading TABs to spaces. --- src/generator.ml | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/generator.ml b/src/generator.ml index 2317541..c261ea2 100644 --- a/src/generator.ml +++ b/src/generator.ml @@ -5398,20 +5398,20 @@ check_state (guestfs_h *g, const char *caller) pr " /* caller will free this */\n"; pr " return safe_memdup (g, &ret.%s, sizeof (ret.%s));\n" n n | RBufferOut n -> - pr " /* RBufferOut is tricky: If the buffer is zero-length, then\n"; - pr " * _val might be NULL here. To make the API saner for\n"; - pr " * callers, we turn this case into a unique pointer (using\n"; - pr " * malloc(1)).\n"; - pr " */\n"; - pr " if (ret.%s.%s_len > 0) {\n" n n; + pr " /* RBufferOut is tricky: If the buffer is zero-length, then\n"; + pr " * _val might be NULL here. To make the API saner for\n"; + pr " * callers, we turn this case into a unique pointer (using\n"; + pr " * malloc(1)).\n"; + pr " */\n"; + pr " if (ret.%s.%s_len > 0) {\n" n n; pr " *size_r = ret.%s.%s_len;\n" n n; pr " return ret.%s.%s_val; /* caller will free */\n" n n; - pr " } else {\n"; - pr " free (ret.%s.%s_val);\n" n n; - pr " char *p = safe_malloc (g, 1);\n"; + pr " } else {\n"; + pr " free (ret.%s.%s_val);\n" n n; + pr " char *p = safe_malloc (g, 1);\n"; pr " *size_r = ret.%s.%s_len;\n" n n; pr " return p;\n"; - pr " }\n"; + pr " }\n"; ); pr "}\n\n" @@ -5592,18 +5592,18 @@ and generate_daemon_actions () | RConstString _ | RConstOptString _ | RString _ | RStringList _ | RHashtable _ | RStruct (_, _) | RStructList (_, _) -> - pr " if (r == %s)\n" error_code; - pr " /* do_%s has already called reply_with_error */\n" name; - pr " goto done;\n"; - pr "\n" + pr " if (r == %s)\n" error_code; + pr " /* do_%s has already called reply_with_error */\n" name; + pr " goto done;\n"; + pr "\n" | RBufferOut _ -> - pr " /* size == 0 && r == NULL could be a non-error case (just\n"; - pr " * an ordinary zero-length buffer), so be careful ...\n"; - pr " */\n"; - pr " if (size == 1 && r == %s)\n" error_code; - pr " /* do_%s has already called reply_with_error */\n" name; - pr " goto done;\n"; - pr "\n" + pr " /* size == 0 && r == NULL could be a non-error case (just\n"; + pr " * an ordinary zero-length buffer), so be careful ...\n"; + pr " */\n"; + pr " if (size == 1 && r == %s)\n" error_code; + pr " /* do_%s has already called reply_with_error */\n" name; + pr " goto done;\n"; + pr "\n" ); (* If there are any FileOut parameters, then the impl must @@ -6684,8 +6684,8 @@ and generate_fish_cmds () pr " pod2text (\"%s\", _(\"%s\"), %S);\n" name2 shortdesc ("=head1 SYNOPSIS\n\n " ^ synopsis ^ "\n\n" ^ - "=head1 DESCRIPTION\n\n" ^ - longdesc ^ warnings ^ describe_alias); + "=head1 DESCRIPTION\n\n" ^ + longdesc ^ warnings ^ describe_alias); pr " else\n" ) all_functions; pr " display_builtin_command (cmd);\n"; -- 1.6.5.3.433.g11067
Jim Meyering
2009-Nov-19 10:41 UTC
[Libguestfs] [PATCH libguestfs] syntax-check: expand TABs in generator.ml
Jim Meyering wrote:>>From 6f128e90afb055f9899011c4a592eb289e678936 Mon Sep 17 00:00:00 2001 > From: Jim Meyering <meyering at redhat.com> > Date: Thu, 19 Nov 2009 11:39:10 +0100 > Subject: [PATCH libguestfs] syntax-check: expand TABs in generator.ml > > * src/generator.ml: Expand leading TABs to spaces.That was incomplete. Please use the following instead. With it, now, "make syntax-check" now passes once again.>From 716a30d0b692972aac8fbea1fb7ad3318ab3a0d8 Mon Sep 17 00:00:00 2001From: Jim Meyering <meyering at redhat.com> Date: Thu, 19 Nov 2009 11:39:10 +0100 Subject: [PATCH libguestfs] syntax-check: expand leading TABs * src/generator.ml: Expand leading TABs to spaces. * fuse/test-fuse.sh: Likewise. --- fuse/test-fuse.sh | 4 ++-- src/generator.ml | 46 +++++++++++++++++++++++----------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/fuse/test-fuse.sh b/fuse/test-fuse.sh index fffd851..2b4d0d7 100755 --- a/fuse/test-fuse.sh +++ b/fuse/test-fuse.sh @@ -69,8 +69,8 @@ function cleanup () # you from unmounting it! Hence the need for this loop. count=10 while ! fusermount -u "$mp" && [ $count -gt 0 ]; do - sleep 1 - ((count--)) + sleep 1 + ((count--)) done rm -f "$image" diff --git a/src/generator.ml b/src/generator.ml index 2317541..c261ea2 100644 --- a/src/generator.ml +++ b/src/generator.ml @@ -5398,20 +5398,20 @@ check_state (guestfs_h *g, const char *caller) pr " /* caller will free this */\n"; pr " return safe_memdup (g, &ret.%s, sizeof (ret.%s));\n" n n | RBufferOut n -> - pr " /* RBufferOut is tricky: If the buffer is zero-length, then\n"; - pr " * _val might be NULL here. To make the API saner for\n"; - pr " * callers, we turn this case into a unique pointer (using\n"; - pr " * malloc(1)).\n"; - pr " */\n"; - pr " if (ret.%s.%s_len > 0) {\n" n n; + pr " /* RBufferOut is tricky: If the buffer is zero-length, then\n"; + pr " * _val might be NULL here. To make the API saner for\n"; + pr " * callers, we turn this case into a unique pointer (using\n"; + pr " * malloc(1)).\n"; + pr " */\n"; + pr " if (ret.%s.%s_len > 0) {\n" n n; pr " *size_r = ret.%s.%s_len;\n" n n; pr " return ret.%s.%s_val; /* caller will free */\n" n n; - pr " } else {\n"; - pr " free (ret.%s.%s_val);\n" n n; - pr " char *p = safe_malloc (g, 1);\n"; + pr " } else {\n"; + pr " free (ret.%s.%s_val);\n" n n; + pr " char *p = safe_malloc (g, 1);\n"; pr " *size_r = ret.%s.%s_len;\n" n n; pr " return p;\n"; - pr " }\n"; + pr " }\n"; ); pr "}\n\n" @@ -5592,18 +5592,18 @@ and generate_daemon_actions () | RConstString _ | RConstOptString _ | RString _ | RStringList _ | RHashtable _ | RStruct (_, _) | RStructList (_, _) -> - pr " if (r == %s)\n" error_code; - pr " /* do_%s has already called reply_with_error */\n" name; - pr " goto done;\n"; - pr "\n" + pr " if (r == %s)\n" error_code; + pr " /* do_%s has already called reply_with_error */\n" name; + pr " goto done;\n"; + pr "\n" | RBufferOut _ -> - pr " /* size == 0 && r == NULL could be a non-error case (just\n"; - pr " * an ordinary zero-length buffer), so be careful ...\n"; - pr " */\n"; - pr " if (size == 1 && r == %s)\n" error_code; - pr " /* do_%s has already called reply_with_error */\n" name; - pr " goto done;\n"; - pr "\n" + pr " /* size == 0 && r == NULL could be a non-error case (just\n"; + pr " * an ordinary zero-length buffer), so be careful ...\n"; + pr " */\n"; + pr " if (size == 1 && r == %s)\n" error_code; + pr " /* do_%s has already called reply_with_error */\n" name; + pr " goto done;\n"; + pr "\n" ); (* If there are any FileOut parameters, then the impl must @@ -6684,8 +6684,8 @@ and generate_fish_cmds () pr " pod2text (\"%s\", _(\"%s\"), %S);\n" name2 shortdesc ("=head1 SYNOPSIS\n\n " ^ synopsis ^ "\n\n" ^ - "=head1 DESCRIPTION\n\n" ^ - longdesc ^ warnings ^ describe_alias); + "=head1 DESCRIPTION\n\n" ^ + longdesc ^ warnings ^ describe_alias); pr " else\n" ) all_functions; pr " display_builtin_command (cmd);\n"; -- 1.6.5.3.433.g11067
Possibly Parallel Threads
- [PATCH] generator: Fix API of functions that return RBufferOut
- [PATCH 0/5] generator: daemon: Various simplifications to stubs code.
- [PATCH 0/6] Allow non-optargs functions to gain optional arguments.
- factorization would be nice
- total warning-removal for daemon/