Fix pgindent of libpq-fe.h by hacking pgindent script.

bmomjian · bmomjian · commit aac96b899490 · 2005-11-23T04:23:30.000Z
Remove pgbench comment that was causing problems.
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
 /*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.46 2005/11/22 18:17:04 momjian Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.47 2005/11/23 04:23:28 momjian Exp $
  *
  * pgbench: a simple benchmark program for PostgreSQL
  * written by Tatsuo Ishii
@@ -1110,8 +1110,7 @@ main(int argc, char **argv)
 					fprintf(stderr, "Use limit/ulimt to increase the limit before using pgbench.\n");
 					exit(1);
 				}
-#endif   /* #if !(defined(__CYGWIN__) ||
-								 * defined(__MINGW32__)) */
+#endif
 				break;
 			case 'C':
 				is_connect = 1;
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.121 2005/11/22 18:17:33 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.122 2005/11/23 04:23:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,7 +35,7 @@ extern		"C"
 
 /* Application-visible enum types */
 
-			typedef enum
+typedef enum
 {
 	/*
 	 * Although it is okay to add to this list, values which become unused
diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent
@@ -1993,6 +1993,14 @@ do
 		}
 		else	print $0;
 	}' |
+# fix indenting of typedef caused by __cplusplus in libpq-fe.h
+	(
+		if echo "$FILE" | grep -q 'libpq-fe.h$'
+		then	sed 's/^[	]*typedef enum/typedef enum/'
+		else	cat
+		fi
+	) |
+# end
 	cat >/tmp/$$ && cat /tmp/$$ >"$FILE"
 done
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.121 2005/11/22 18:17:33 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/libpq-fe.h,v 1.122 2005/11/23 04:23:28 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -35,7 +35,7 @@ extern "C"`
`35`	`35`
`36`	`36`	`/* Application-visible enum types */`
`37`	`37`
`38`		`- typedef enum`
	`38`	`+typedef enum`
`39`	`39`	`{`
`40`	`40`	`/*`
`41`	`41`	`* Although it is okay to add to this list, values which become unused`