aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/Gen_fmgrtab.sh4
-rw-r--r--src/backend/utils/adt/arrayfuncs.c28
-rw-r--r--src/backend/utils/adt/formatting.c20
-rw-r--r--src/backend/utils/adt/numutils.c4
-rw-r--r--src/backend/utils/adt/ri_triggers.c4
-rw-r--r--src/backend/utils/adt/selfuncs.c4
-rw-r--r--src/backend/utils/fmgr/dfmgr.c28
-rw-r--r--src/backend/utils/fmgr/fmgr.c8
8 files changed, 48 insertions, 52 deletions
diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh
index d4f8cc8ba87..dc302ddbd92 100644
--- a/src/backend/utils/Gen_fmgrtab.sh
+++ b/src/backend/utils/Gen_fmgrtab.sh
@@ -9,7 +9,7 @@
#
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/backend/utils/Gen_fmgrtab.sh,v 1.28 2004/01/04 05:57:21 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/utils/Gen_fmgrtab.sh,v 1.29 2004/01/07 18:56:28 neilc Exp $
#
#-------------------------------------------------------------------------
@@ -223,7 +223,7 @@ cat >> "$$-$TABLEFILE" <<FuNkYfMgRtAbStUfF
/* dummy entry is easier than getting rid of comma after last real one */
/* (not that there has ever been anything wrong with *having* a
comma after the last field in an array initializer) */
- { 0, NULL, 0, false, false, (PGFunction) NULL }
+ { 0, NULL, 0, false, false, NULL }
};
/* Note fmgr_nbuiltins excludes the dummy entry */
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 94a5de09d90..ba734a09752 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.101 2003/11/29 19:51:57 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.102 2004/01/07 18:56:28 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -307,10 +307,8 @@ array_in(PG_FUNCTION_ARGS)
retval->size = nbytes;
retval->ndim = ndim;
retval->elemtype = element_type;
- memcpy((char *) ARR_DIMS(retval), (char *) dim,
- ndim * sizeof(int));
- memcpy((char *) ARR_LBOUND(retval), (char *) lBound,
- ndim * sizeof(int));
+ memcpy(ARR_DIMS(retval), dim, ndim * sizeof(int));
+ memcpy(ARR_LBOUND(retval), lBound, ndim * sizeof(int));
CopyArrayEls(ARR_DATA_PTR(retval), dataPtr, nitems,
typlen, typbyval, typalign, true);
@@ -972,10 +970,8 @@ array_recv(PG_FUNCTION_ARGS)
retval->size = nbytes;
retval->ndim = ndim;
retval->elemtype = element_type;
- memcpy((char *) ARR_DIMS(retval), (char *) dim,
- ndim * sizeof(int));
- memcpy((char *) ARR_LBOUND(retval), (char *) lBound,
- ndim * sizeof(int));
+ memcpy(ARR_DIMS(retval), dim, ndim * sizeof(int));
+ memcpy(ARR_LBOUND(retval), lBound, ndim * sizeof(int));
CopyArrayEls(ARR_DATA_PTR(retval), dataPtr, nitems,
typlen, typbyval, typalign, true);
@@ -1384,7 +1380,7 @@ array_ref(ArrayType *array,
char *arraydataptr,
*retptr;
- if (array == (ArrayType *) NULL)
+ if (array == NULL)
RETURN_NULL(Datum);
if (arraylen > 0)
@@ -1463,7 +1459,7 @@ array_get_slice(ArrayType *array,
int bytes,
span[MAXDIM];
- if (array == (ArrayType *) NULL)
+ if (array == NULL)
RETURN_NULL(ArrayType *);
if (arraylen > 0)
@@ -1602,7 +1598,7 @@ array_set(ArrayType *array,
lenbefore,
lenafter;
- if (array == (ArrayType *) NULL)
+ if (array == NULL)
RETURN_NULL(ArrayType *);
if (arraylen > 0)
@@ -1798,9 +1794,9 @@ array_set_slice(ArrayType *array,
lenbefore,
lenafter;
- if (array == (ArrayType *) NULL)
+ if (array == NULL)
RETURN_NULL(ArrayType *);
- if (srcArray == (ArrayType *) NULL)
+ if (srcArray == NULL)
return array;
if (arraylen > 0)
@@ -2279,8 +2275,8 @@ construct_md_array(Datum *elems,
result->ndim = ndims;
result->flags = 0;
result->elemtype = elmtype;
- memcpy((char *) ARR_DIMS(result), (char *) dims, ndims * sizeof(int));
- memcpy((char *) ARR_LBOUND(result), (char *) lbs, ndims * sizeof(int));
+ memcpy(ARR_DIMS(result), dims, ndims * sizeof(int));
+ memcpy(ARR_LBOUND(result), lbs, ndims * sizeof(int));
CopyArrayEls(ARR_DATA_PTR(result), elems, nelems,
elmlen, elmbyval, elmalign, false);
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index d808ac90e25..25db1b0f5d3 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
* formatting.c
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.71 2003/12/25 03:36:23 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.72 2004/01/07 18:56:28 neilc Exp $
*
*
* Portions Copyright (c) 1999-2003, PostgreSQL Global Development Group
@@ -927,7 +927,7 @@ index_seq_search(char *str, KeyWord *kw, int *index)
int poz;
if (!KeyWord_INDEX_FILTER(*str))
- return (KeyWord *) NULL;
+ return NULL;
if ((poz = *(index + (*str - ' '))) > -1)
{
@@ -940,10 +940,10 @@ index_seq_search(char *str, KeyWord *kw, int *index)
return k;
k++;
if (!k->name)
- return (KeyWord *) NULL;
+ return NULL;
} while (*str == *k->name);
}
- return (KeyWord *) NULL;
+ return NULL;
}
static KeySuffix *
@@ -959,7 +959,7 @@ suff_search(char *str, KeySuffix *suf, int type)
if (!strncmp(str, s->name, s->len))
return s;
}
- return (KeySuffix *) NULL;
+ return NULL;
}
/* ----------
@@ -1246,7 +1246,7 @@ parse_format(FormatNode *node, char *str, KeyWord *kw,
}
n->type = NODE_TYPE_CHAR;
n->character = *str;
- n->key = (KeyWord *) NULL;
+ n->key = NULL;
n->suffix = 0;
++n;
x = *str;
@@ -1266,7 +1266,7 @@ parse_format(FormatNode *node, char *str, KeyWord *kw,
{
n->type = NODE_TYPE_CHAR;
n->character = *str;
- n->key = (KeyWord *) NULL;
+ n->key = NULL;
node_set = 1;
last = 0;
str++;
@@ -2731,7 +2731,7 @@ DCH_cache_getnew(char *str)
return ent;
}
- return (DCHCacheEntry *) NULL; /* never */
+ return NULL; /* never */
}
static DCHCacheEntry *
@@ -2761,7 +2761,7 @@ DCH_cache_search(char *str)
i++;
}
- return (DCHCacheEntry *) NULL;
+ return NULL;
}
static text *
@@ -3362,7 +3362,7 @@ NUM_cache_search(char *str)
i++;
}
- return (NUMCacheEntry *) NULL;
+ return NULL;
}
static void
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 2f004af2871..d169be8bd09 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -11,7 +11,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/numutils.c,v 1.59 2003/11/29 19:51:59 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/numutils.c,v 1.60 2004/01/07 18:56:28 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -64,7 +64,7 @@ pg_atoi(char *s, int size, int c)
* Some versions of strtol treat the empty string as an error, but
* some seem not to. Make an explicit test to be sure we catch it.
*/
- if (s == (char *) NULL)
+ if (s == NULL)
elog(ERROR, "NULL pointer");
if (*s == 0)
ereport(ERROR,
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index 71fa86fc1e7..73aab9e5781 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.65 2003/11/29 19:51:59 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/ri_triggers.c,v 1.66 2004/01/07 18:56:28 neilc Exp $
*
* ----------
*/
@@ -114,7 +114,7 @@ typedef struct RI_QueryHashEntry
* Local data
* ----------
*/
-static HTAB *ri_query_cache = (HTAB *) NULL;
+static HTAB *ri_query_cache = NULL;
/* ----------
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 93e8040b9b5..bc5e8c799b6 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.153 2004/01/05 23:39:54 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/selfuncs.c,v 1.154 2004/01/07 18:56:28 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3822,7 +3822,7 @@ make_greater_string(const Const *str_const)
if (workstr != NULL)
pfree(workstr);
- return (Const *) NULL;
+ return NULL;
}
/*
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index dd0f84af61d..6c690f7b380 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.67 2003/11/29 19:52:01 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.68 2004/01/07 18:56:29 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -40,8 +40,8 @@ typedef struct df_files
*/
} DynamicFileList;
-static DynamicFileList *file_list = (DynamicFileList *) NULL;
-static DynamicFileList *file_tail = (DynamicFileList *) NULL;
+static DynamicFileList *file_list = NULL;
+static DynamicFileList *file_tail = NULL;
#define SAME_INODE(A,B) ((A).st_ino == (B).inode && (A).st_dev == (B).device)
@@ -84,11 +84,11 @@ load_external_function(char *filename, char *funcname,
* Scan the list of loaded FILES to see if the file has been loaded.
*/
for (file_scanner = file_list;
- file_scanner != (DynamicFileList *) NULL &&
+ file_scanner != NULL &&
strcmp(fullname, file_scanner->filename) != 0;
file_scanner = file_scanner->next)
;
- if (file_scanner == (DynamicFileList *) NULL)
+ if (file_scanner == NULL)
{
/*
* Check for same files - different paths (ie, symlink or link)
@@ -100,13 +100,13 @@ load_external_function(char *filename, char *funcname,
fullname)));
for (file_scanner = file_list;
- file_scanner != (DynamicFileList *) NULL &&
+ file_scanner != NULL &&
!SAME_INODE(stat_buf, *file_scanner);
file_scanner = file_scanner->next)
;
}
- if (file_scanner == (DynamicFileList *) NULL)
+ if (file_scanner == NULL)
{
/*
* File not loaded yet.
@@ -122,10 +122,10 @@ load_external_function(char *filename, char *funcname,
strcpy(file_scanner->filename, fullname);
file_scanner->device = stat_buf.st_dev;
file_scanner->inode = stat_buf.st_ino;
- file_scanner->next = (DynamicFileList *) NULL;
+ file_scanner->next = NULL;
file_scanner->handle = pg_dlopen(fullname);
- if (file_scanner->handle == (void *) NULL)
+ if (file_scanner->handle == NULL)
{
load_error = (char *) pg_dlerror();
free((char *) file_scanner);
@@ -137,7 +137,7 @@ load_external_function(char *filename, char *funcname,
}
/* OK to link it into list */
- if (file_list == (DynamicFileList *) NULL)
+ if (file_list == NULL)
file_list = file_scanner;
else
file_tail->next = file_scanner;
@@ -151,15 +151,15 @@ load_external_function(char *filename, char *funcname,
/*
* If funcname is NULL, we only wanted to load the file.
*/
- if (funcname == (char *) NULL)
+ if (funcname == NULL)
{
pfree(fullname);
- return (PGFunction) NULL;
+ return NULL;
}
retval = pg_dlsym(file_scanner->handle, funcname);
- if (retval == (PGFunction) NULL && signalNotFound)
+ if (retval == NULL && signalNotFound)
ereport(ERROR,
(errcode(ERRCODE_UNDEFINED_FUNCTION),
errmsg("could not find function \"%s\" in file \"%s\"",
@@ -221,7 +221,7 @@ load_file(char *filename)
prv = file_scanner;
}
- load_external_function(fullname, (char *) NULL, false, (void *) NULL);
+ load_external_function(fullname, NULL, false, NULL);
pfree(fullname);
}
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index c42dfba32b5..82f84bdd4e2 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.78 2004/01/06 23:55:19 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/fmgr/fmgr.c,v 1.79 2004/01/07 18:56:29 neilc Exp $
*
*-------------------------------------------------------------------------
*/
@@ -93,7 +93,7 @@ fmgr_isbuiltin(Oid id)
else
high = i - 1;
}
- return (const FmgrBuiltin *) NULL;
+ return NULL;
}
/*
@@ -111,7 +111,7 @@ fmgr_lookupByName(const char *name)
if (strcmp(name, fmgr_builtins[i].funcName) == 0)
return fmgr_builtins + i;
}
- return (const FmgrBuiltin *) NULL;
+ return NULL;
}
/*
@@ -384,7 +384,7 @@ fetch_finfo_record(void *filehandle, char *funcname)
/* Try to look up the info function */
infofunc = (PGFInfoFunction) lookup_external_function(filehandle,
infofuncname);
- if (infofunc == (PGFInfoFunction) NULL)
+ if (infofunc == NULL)
{
/* Not found --- assume version 0 */
pfree(infofuncname);
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-03 14:17:26 +0000