database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-29 22:49:41 +03:00
Code Activity

Remove xstrdup and friends who were only called once. Replace with

Browse Source 
#ifdef calls.
This commit is contained in:
Bruce Momjian
2004-08-08 03:51:20 +00:00
parent 7dca975c5d
commit dc94d4ab57
1 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/port/dirmod.c
View File

@@ -10,7 +10,7 @@
* Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me. * Win32 (NT, Win2k, XP). replace() doesn't work on Win95/98/Me.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/dirmod.c,v 1.15 2004/08/08 01:31:15 momjian Exp $ * $PostgreSQL: pgsql/src/port/dirmod.c,v 1.16 2004/08/08 03:51:20 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -224,74 +224,34 @@ pgsymlink(const char *oldpath, const char *newpath)
#endif #endif
/* ---------------- /* We undefined this above, so we redefine it */
* rmtree routines
* ----------------
*/
/* We undefined these above, so we redefine them */
#if defined(WIN32) || defined(__CYGWIN__) #if defined(WIN32) || defined(__CYGWIN__)
#define unlink(path) pgunlink(path) #define unlink(path) pgunlink(path)
#endif #endif
#ifdef FRONTEND
static void *
xmalloc(size_t size)
{
void *result;
result = malloc(size);
if (!result)
{
fprintf(stderr, _("out of memory\n"));
exit(1);
}
return result;
}
static char *
xstrdup(const char *s)
{
char *result;
result = strdup(s);
if (!result)
{
fprintf(stderr, _("out of memory\n"));
exit(1);
}
return result;
}
#define xfree(n) free(n)
#else
/* on the backend, use palloc and friends */
#define xmalloc(n) palloc(n)
#define xstrdup(n) pstrdup(n)
#define xfree(n) pfree(n)
#endif
/* /*
* deallocate memory used for filenames * rmt_cleanup
*
* deallocate memory used for filenames
*/ */
static void static void
rmt_cleanup(char ** filenames) rmt_cleanup(char ** filenames)
{ {
char ** fn; char ** fn;
for (fn = filenames; *fn; fn++) for (fn = filenames; *fn; fn++)
xfree(*fn); #ifdef FRONTEND
free(*fn);
xfree(filenames); free(filenames);
#else
pfree(*fn);
pfree(filenames);
#endif
} }
/* /*
* rmtree * rmtree
* *
@@ -329,13 +289,30 @@ rmtree(char *path, bool rmtopdir)
rewinddir(dir); rewinddir(dir);
filenames = xmalloc((numnames + 2) * sizeof(char *)); #ifdef FRONTEND
if ((filenames = malloc((numnames + 2) * sizeof(char *))) == NULL)
{
fprintf(stderr, _("out of memory\n"));
exit(1);
}
#else
filenames = palloc((numnames + 2) * sizeof(char *));
#endif
numnames = 0; numnames = 0;
while ((file = readdir(dir)) != NULL) while ((file = readdir(dir)) != NULL)
{ {
if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0) if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0)
filenames[numnames++] = xstrdup(file->d_name); #ifdef FRONTEND
if ((filenames[numnames++] = strdup(file->d_name)) == NULL)
{
fprintf(stderr, _("out of memory\n"));
exit(1);
}
#else
filenames[numnames++] = pstrdup(file->d_name);
#endif
} }
filenames[numnames] = NULL; filenames[numnames] = NULL;