summaryrefslogtreecommitdiff
path: root/src/tools/entab
diff options
context:
space:
mode:
authorBruce Momjian1997-09-08 02:41:22 +0000
committerBruce Momjian1997-09-08 02:41:22 +0000
commit319dbfa7364721d3343af03a7ce063c2a2c9d385 (patch)
treea2146fe02c49ce1e497b7c287dfcaa367a703ae4 /src/tools/entab
parenta90f12fd9d6886da4f0734288496361a304d3882 (diff)
Another PGINDENT run that changes variable indenting and case label indenting. Also static variable indenting.
Diffstat (limited to 'src/tools/entab')
-rw-r--r--src/tools/entab/entab.c82
-rw-r--r--src/tools/entab/halt.c8
2 files changed, 45 insertions, 45 deletions
diff --git a/src/tools/entab/entab.c b/src/tools/entab/entab.c
index b11b84989e..5aa94e6abf 100644
--- a/src/tools/entab/entab.c
+++ b/src/tools/entab/entab.c
@@ -21,33 +21,33 @@
#define FALSE 0
#endif
-void halt();
+void halt();
-extern char *optarg;
-extern int optind;
+extern char *optarg;
+extern int optind;
int
main(argc, argv)
-int argc;
-char **argv;
+int argc;
+char **argv;
{
- int tab_size = 8,
- min_spaces = 2,
- protect_quotes = FALSE,
- del_tabs = FALSE,
- clip_lines = FALSE,
- prv_spaces,
- col_in_tab,
- escaped,
- nxt_spaces;
- char in_line[BUFSIZ],
- out_line[BUFSIZ],
- *src,
- *dst,
- quote_char,
- ch,
- *cp;
- FILE *in_file;
+ int tab_size = 8,
+ min_spaces = 2,
+ protect_quotes = FALSE,
+ del_tabs = FALSE,
+ clip_lines = FALSE,
+ prv_spaces,
+ col_in_tab,
+ escaped,
+ nxt_spaces;
+ char in_line[BUFSIZ],
+ out_line[BUFSIZ],
+ *src,
+ *dst,
+ quote_char,
+ ch,
+ *cp;
+ FILE *in_file;
if ((cp = strrchr(argv[0], '/')) != NULL)
++cp;
@@ -59,30 +59,30 @@ char **argv;
while ((ch = getopt(argc, argv, "cdhqs:t:")) != -1)
switch (ch)
{
- case 'c':
- clip_lines = TRUE;
- break;
- case 'd':
- del_tabs = TRUE;
- break;
- case 'q':
- protect_quotes = TRUE;
- break;
- case 's':
- min_spaces = atoi(optarg);
- break;
- case 't':
- tab_size = atoi(optarg);
- break;
- case 'h':
- case '?':
- halt("USAGE: %s [ -cdqst ] [file ...]\n\
+ case 'c':
+ clip_lines = TRUE;
+ break;
+ case 'd':
+ del_tabs = TRUE;
+ break;
+ case 'q':
+ protect_quotes = TRUE;
+ break;
+ case 's':
+ min_spaces = atoi(optarg);
+ break;
+ case 't':
+ tab_size = atoi(optarg);
+ break;
+ case 'h':
+ case '?':
+ halt("USAGE: %s [ -cdqst ] [file ...]\n\
-c (clip trailing whitespace)\n\
-d (delete tabs)\n\
-q (protect quotes)\n\
-s minimum_spaces\n\
-t tab_width\n",
- cp);
+ cp);
}
argv += optind;
diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c
index 5d48f58152..c7b9ab6bb9 100644
--- a/src/tools/entab/halt.c
+++ b/src/tools/entab/halt.c
@@ -22,10 +22,10 @@ void
halt(va_alist)
va_dcl
{
- va_list arg_ptr;
- char *format,
- *pstr;
- void (*sig_func) ();
+ va_list arg_ptr;
+ char *format,
+ *pstr;
+ void (*sig_func) ();
va_start(arg_ptr);
format = va_arg(arg_ptr, char *);