summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorBruce Momjian1998-09-01 03:29:17 +0000
committerBruce Momjian1998-09-01 03:29:17 +0000
commitaf74855a608da4cd7ef88ceb2241ec1c75537f39 (patch)
tree912ecaa0cdd84297ad886df5ed7c046c7c501411 /src/bin
parent2aa080fc933cac47205bc79f026fc89dab0e5149 (diff)
Renaming cleanup, no pgindent yet.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/pg_dump/common.c4
-rw-r--r--src/bin/pg_dump/pg_dump.c14
-rw-r--r--src/bin/pg_version/pg_version.c4
3 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index d84ac0aa5ec..2797ce76618 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.22 1998/06/19 02:55:13 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/common.c,v 1.23 1998/09/01 03:27:19 momjian Exp $
*
* Modifications - 6/12/96 - dave@bensoft.com - version 1.13.dhb.2
*
@@ -490,5 +490,5 @@ fmtId(const char *rawid)
}
else
cp = rawid;
- return (cp);
+ return cp;
} /* fmtId() */
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index e6b448feaef..5d29197c7ba 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -21,7 +21,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.81 1998/08/29 18:06:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.82 1998/09/01 03:27:21 momjian Exp $
*
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
*
@@ -409,7 +409,7 @@ dumpClasses_dumpData(FILE *fout, const char *classname,
* dump the contents of all the classes.
*/
static void
-dumpClasses(const TableInfo tblinfo[], const int numTables, FILE *fout,
+dumpClasses(const TableInfo *tblinfo, const int numTables, FILE *fout,
const char *onlytable, const bool oids)
{
@@ -2270,12 +2270,12 @@ AddAcl(char *s, const char *add)
char *t;
if (s == (char *) NULL)
- return (strdup(add));
+ return strdup(add);
t = (char *) calloc((strlen(s) + strlen(add) + 1), sizeof(char));
sprintf(t, "%s,%s", s, add);
- return (t);
+ return t;
}
/*
@@ -2294,7 +2294,7 @@ GetPrivledges(char *s)
/* RULE == R */
if (strstr(s, "arwR"))
- return (strdup("ALL"));
+ return strdup("ALL");
if (strchr(s, 'a'))
acls = AddAcl(acls, "INSERT");
@@ -2308,7 +2308,7 @@ GetPrivledges(char *s)
if (strchr(s, 'R'))
acls = AddAcl(acls, "RULES");
- return (acls);
+ return acls;
}
/* This will parse the acl string of TableInfo
@@ -2373,7 +2373,7 @@ ParseACL(const char *acls, int *count)
}
*count = NumAcls;
- return (ParsedAcl);
+ return ParsedAcl;
}
/*
* dumpACL:
diff --git a/src/bin/pg_version/pg_version.c b/src/bin/pg_version/pg_version.c
index 541995ffcad..c2ef7491f79 100644
--- a/src/bin/pg_version/pg_version.c
+++ b/src/bin/pg_version/pg_version.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.9 1998/03/30 16:47:35 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/pg_version.c,v 1.10 1998/09/01 03:27:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -41,5 +41,5 @@ main(int argc, char **argv)
}
else
retcode = 0;
- return (retcode);
+ return retcode;
}