aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/arrayfuncs.c14
-rw-r--r--src/backend/utils/adt/date.c6
-rw-r--r--src/backend/utils/adt/geo_ops.c6
-rw-r--r--src/backend/utils/adt/nabstime.c6
-rw-r--r--src/backend/utils/adt/numutils.c6
-rw-r--r--src/backend/utils/adt/regexp.c4
-rw-r--r--src/backend/utils/adt/sets.c4
-rw-r--r--src/backend/utils/cache/relcache.c8
-rw-r--r--src/backend/utils/error/elog.c4
-rw-r--r--src/backend/utils/error/exc.c24
-rw-r--r--src/backend/utils/error/format.c4
-rw-r--r--src/backend/utils/hash/dynahash.c10
-rw-r--r--src/backend/utils/init/postinit.c6
-rw-r--r--src/backend/utils/mmgr/portalmem.c4
-rw-r--r--src/backend/utils/sort/lselect.c4
-rw-r--r--src/backend/utils/sort/psort.c9
16 files changed, 59 insertions, 60 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index eb099e973ec..71acc8e998a 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.12 1997/07/29 15:51:33 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.13 1997/08/12 22:54:24 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -717,7 +717,7 @@ array_ref(ArrayType *array,
if (*isNull) RETURN_NULL;
if (VARSIZE(v) - 4 < elmlen)
RETURN_NULL;
- (void) lo_close(fd);
+ lo_close(fd);
retval = (char *)_ArrayCast((char *)VARDATA(v), reftype, elmlen);
if ( reftype == 0) { /* not by value */
char * tempdata = palloc (elmlen);
@@ -847,8 +847,8 @@ array_clip(ArrayType *array,
_ReadArray(lowerIndx, upperIndx, len, fd, newfd, array, 1,isNull);
}
#ifdef LOARRAY
- (void) LOclose(fd);
- (void) LOclose(newfd);
+ LOclose(fd);
+ LOclose(newfd);
#endif
if (*isNull) {
pfree(newArr);
@@ -944,7 +944,7 @@ array_set(ArrayType *array,
RETURN_NULL;
*/
pfree(v);
- (void) lo_close(fd);
+ lo_close(fd);
return((char *)array);
}
if (elmlen > 0) {
@@ -1045,12 +1045,12 @@ array_assgn(ArrayType *array,
return((char *)array);
#endif
_LOArrayRange(lowerIndx, upperIndx, len, fd, newfd, array, 1, isNull);
- (void) lo_close(newfd);
+ lo_close(newfd);
} else {
_LOArrayRange(lowerIndx, upperIndx, len, fd, (int)ARR_DATA_PTR(newArr),
array, 0, isNull);
}
- (void) lo_close(fd);
+ lo_close(fd);
return ((char *) array);
}
_ArrayRange(lowerIndx, upperIndx, len, ARR_DATA_PTR(newArr), array, 0);
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 0d75f44df6e..70fc35cb694 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.11 1997/08/12 20:15:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/date.c,v 1.12 1997/08/12 22:54:26 momjian Exp $
*
* NOTES
* This code is actually (almost) unused.
@@ -214,10 +214,10 @@ reltime2tm(int32 time, struct tm *tm)
if (quantity > 1 || quantity < -1)
unitnr++; /* adjust index for PLURAL of unit */
if (quantity >= 0)
- (void) sprintf( timestring, "%c %lu %s", RELTIME_LABEL,
+ sprintf( timestring, "%c %lu %s", RELTIME_LABEL,
quantity, unit_tab[unitnr]);
else
- (void) sprintf( timestring, "%c %lu %s %s", RELTIME_LABEL,
+ sprintf( timestring, "%c %lu %s %s", RELTIME_LABEL,
(quantity * -1), unit_tab[unitnr], RELTIME_PAST);
return(timestring);
}
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 320270e7abd..feea5559c06 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.13 1997/07/29 16:08:18 thomas Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.14 1997/08/12 22:54:29 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -108,7 +108,7 @@ fprintf( stderr, "single_decode- (%x) try decoding %s to %g\n", (cp-str), str, *
int single_encode(float8 x, char *str)
{
- (void) sprintf(str, "%.*g", digits8, x);
+ sprintf(str, "%.*g", digits8, x);
return(TRUE);
} /* single_encode() */
@@ -144,7 +144,7 @@ int pair_decode(char *str, float8 *x, float8 *y, char **s)
int pair_encode(float8 x, float8 y, char *str)
{
- (void) sprintf(str, "%.*g,%.*g", digits8, x, digits8, y);
+ sprintf(str, "%.*g,%.*g", digits8, x, digits8, y);
return(TRUE);
}
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 52e3113041e..0c85cae8642 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.29 1997/08/12 20:16:00 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.30 1997/08/12 22:54:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -53,7 +53,7 @@ GetCurrentAbsoluteTime(void)
#else /* ! USE_POSIX_TIME */
struct timeb tb; /* the old V7-ism */
- (void) ftime(&tb);
+ ftime(&tb);
now = tb.time;
#endif
@@ -111,7 +111,7 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm *tm, char *tzn)
#else /* ! USE_POSIX_TIME */
struct timeb tb; /* the old V7-ism */
- (void) ftime(&tb);
+ ftime(&tb);
#endif
#ifdef USE_POSIX_TIME
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 77867d50dc0..8e944de3fa6 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.11 1997/08/12 20:16:02 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/numutils.c,v 1.12 1997/08/12 22:54:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -142,8 +142,8 @@ ftoa(double value, char *ascii, int width, int prec1, char format)
char fmt[256];
int ret;
- (void) sprintf(fmt, "%%%d.%d%c", width, prec1, format);
- (void) sprintf(out, fmt, value);
+ sprintf(fmt, "%%%d.%d%c", width, prec1, format);
+ sprintf(out, fmt, value);
if ((ret = strlen(out)) > width) {
memset(ascii, '*', width - 2);
ascii[width] = 0;
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index e791a1d7b17..a0d61b8304c 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.6 1997/08/12 20:16:04 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/regexp.c,v 1.7 1997/08/12 22:54:36 momjian Exp $
*
* Alistair Crooks added the code for the regex caching
* agc - cached the regular expressions used - there's a good chance
@@ -119,7 +119,7 @@ RE_compile_and_execute(struct varlena *text_re, char *text, int cflags)
/* use malloc/free for the cre_s field because the storage
has to persist across transactions */
rev[oldest].cre_s = (char *) malloc(n + 1);
- (void) memmove(rev[oldest].cre_s, re, n);
+ memmove(rev[oldest].cre_s, re, n);
rev[oldest].cre_s[n] = 0;
rev[oldest].cre_text = text_re;
rev[oldest].cre_lru = ++lru;
diff --git a/src/backend/utils/adt/sets.c b/src/backend/utils/adt/sets.c
index 0a2f24f7b80..55ca1f4b643 100644
--- a/src/backend/utils/adt/sets.c
+++ b/src/backend/utils/adt/sets.c
@@ -9,7 +9,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.4 1997/01/10 20:19:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/Attic/sets.c,v 1.5 1997/08/12 22:54:38 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -129,7 +129,7 @@ SetDefine(char *querystr, char *typename)
ItemPointerCopy(&tup->t_ctid, &ipdata);
setheapoverride(true);
- (void) heap_replace(procrel, &ipdata, newtup);
+ heap_replace(procrel, &ipdata, newtup);
setheapoverride(false);
setoid = newtup->t_oid;
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 28be97d1133..0282a60d806 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.11 1997/08/03 02:37:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.12 1997/08/12 22:54:41 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1607,7 +1607,7 @@ init_irels(void)
return;
}
- (void) FileSeek(fd, 0L, SEEK_SET);
+ FileSeek(fd, 0L, SEEK_SET);
for (relno = 0; relno < Num_indices_bootstrap; relno++) {
/* first read the relation descriptor length*/
@@ -1748,7 +1748,7 @@ write_irels(void)
if (fd < 0)
elog(FATAL, "cannot create init file %s", INIT_FILENAME);
- (void) FileSeek(fd, 0L, SEEK_SET);
+ FileSeek(fd, 0L, SEEK_SET);
/*
* Build a relation descriptor for pg_attnumind without resort to the
@@ -1853,5 +1853,5 @@ write_irels(void)
ird->rd_rel = relform;
}
- (void) FileClose(fd);
+ FileClose(fd);
}
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index c039e00102d..fae4c1adeef 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.16 1997/07/24 20:16:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.17 1997/08/12 22:54:44 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -197,7 +197,7 @@ DebugFileOpen(void)
elog(FATAL, "DebugFileOpen: open of %s: %m",
OutputFileName);
istty = isatty(fd);
- (void) close(fd);
+ close(fd);
/* If the file is a tty and we're running under the
* postmaster, try to send stdout there as well (if it
* isn't a tty then stderr will block out stdout, so we
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 94c2b27f93e..a1b185fcd0f 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.13 1997/03/26 03:27:04 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.14 1997/08/12 22:54:46 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -99,34 +99,34 @@ ExcPrint(Exception *excP,
data = data;
#endif
- (void) fflush(stdout); /* In case stderr is buffered */
+ fflush(stdout); /* In case stderr is buffered */
#if 0
if (ProgramName != NULL && *ProgramName != '\0')
- (void) fprintf(stderr, "%s: ", ProgramName);
+ fprintf(stderr, "%s: ", ProgramName);
#endif
if (message != NULL)
- (void) fprintf(stderr, "%s", message);
+ fprintf(stderr, "%s", message);
else if (excP->message != NULL)
- (void) fprintf(stderr, "%s", excP->message);
+ fprintf(stderr, "%s", excP->message);
else
#ifdef lint
- (void) fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", excP);
+ fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", excP);
#else
- (void) fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", (long)excP);
+ fprintf(stderr, "UNNAMED EXCEPTION 0x%lx", (long)excP);
#endif
- (void) fprintf(stderr, " (%ld)", detail);
+ fprintf(stderr, " (%ld)", detail);
if (errno > 0 && errno < sys_nerr)
- (void) fprintf(stderr, " [%s]", strerror(errno));
+ fprintf(stderr, " [%s]", strerror(errno));
else if (errno != 0)
- (void) fprintf(stderr, " [Error %d]", errno);
+ fprintf(stderr, " [Error %d]", errno);
- (void) fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
- (void) fflush(stderr);
+ fflush(stderr);
}
ExcProc *
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 46ffd67673b..bdbaddb402f 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.2 1997/05/17 16:23:06 mergl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.3 1997/08/12 22:54:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -32,7 +32,7 @@ form(const char *fmt, ... )
va_start(args, fmt);
- (void) vsprintf(FormBuf, fmt, args);
+ vsprintf(FormBuf, fmt, args);
va_end(args);
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index f2cab230cf5..db209e1c338 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.6 1996/11/10 03:03:36 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/hash/dynahash.c,v 1.7 1997/08/12 22:54:50 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -377,10 +377,10 @@ hash_destroy (HTAB *hashp)
}
free((char *)segp);
}
- (void) MEM_FREE( (char *) hashp->dir);
- (void) MEM_FREE( (char *) hashp->hctl);
+ MEM_FREE( (char *) hashp->dir);
+ MEM_FREE( (char *) hashp->hctl);
hash_stats("destroy",hashp);
- (void) MEM_FREE( (char *) hashp);
+ MEM_FREE( (char *) hashp);
}
}
@@ -767,7 +767,7 @@ dir_realloc(HTAB *hashp)
if (p != NULL) {
memmove(p, *p_ptr, old_dirsize );
memset ( *p_ptr + old_dirsize, 0, new_dirsize-old_dirsize );
- (void) free( (char *)*p_ptr);
+ free( (char *)*p_ptr);
*p_ptr = p;
hashp->hctl->dsize = new_dirsize;
return(1);
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 7ed1b7f94fc..253814f33da 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.9 1997/07/24 20:17:34 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.10 1997/08/12 22:54:54 momjian Exp $
*
* NOTES
* InitPostgres() is the function called from PostgresMain
@@ -217,7 +217,7 @@ InitMyDatabaseId()
}
done:
- (void) close(dbfd);
+ close(dbfd);
pfree(pg);
if (!OidIsValid(MyDatabaseId))
@@ -463,7 +463,7 @@ InitCommunication()
void
InitStdio()
{
- (void) DebugFileOpen();
+ DebugFileOpen();
}
/* --------------------------------
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index f91d1f5c8b0..23e600ce244 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.3 1996/11/08 06:00:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.4 1997/08/12 22:54:57 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -817,7 +817,7 @@ PortalResetHeapMemory(Portal portal)
} while (PointerIsValid(context->block));
/* restore context */
- (void) MemoryContextSwitchTo(currentContext);
+ MemoryContextSwitchTo(currentContext);
}
}
diff --git a/src/backend/utils/sort/lselect.c b/src/backend/utils/sort/lselect.c
index 26a3ca38576..6797bd40ca0 100644
--- a/src/backend/utils/sort/lselect.c
+++ b/src/backend/utils/sort/lselect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.4 1997/08/06 03:41:47 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/lselect.c,v 1.5 1997/08/12 22:55:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -183,8 +183,6 @@ tuplecmp(HeapTuple ltup, HeapTuple rtup, LeftistContext context)
{
register char *lattr, *rattr;
int nkey = 0;
- extern int Nkeys;
- extern ScanKey Key;
int result = 0;
bool isnull;
diff --git a/src/backend/utils/sort/psort.c b/src/backend/utils/sort/psort.c
index dbda8abd1ff..8442fbe45f2 100644
--- a/src/backend/utils/sort/psort.c
+++ b/src/backend/utils/sort/psort.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.12 1997/08/12 20:16:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/sort/Attic/psort.c,v 1.13 1997/08/12 22:55:02 momjian Exp $
*
* NOTES
* Sorts the first relation into the second relation.
@@ -35,6 +35,9 @@
*/
#include <stdio.h>
#include <math.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
#include "postgres.h"
@@ -342,9 +345,8 @@ bool
createrun(Sort *node, FILE *file, bool *empty)
{
register HeapTuple lasttuple;
- register HeapTuple btup, tup;
+ register HeapTuple tup;
struct leftist *nextrun;
- Buffer b;
bool foundeor;
short junk;
@@ -726,7 +728,6 @@ struct tapelst {
};
static struct tapelst *Tapes = NULL;
-static char Tempfile[MAXPGPATH] = TEMPDIR;
/*
* gettape - returns an open stream for writing/reading
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 22:25:27 +0000