aboutsummaryrefslogtreecommitdiff
path: root/src/timezone/ialloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/timezone/ialloc.c')
-rw-r--r--src/timezone/ialloc.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/timezone/ialloc.c b/src/timezone/ialloc.c
index b723f932c85..ec3cbaf29a0 100644
--- a/src/timezone/ialloc.c
+++ b/src/timezone/ialloc.c
@@ -5,54 +5,63 @@
#define nonzero(n) (((n) == 0) ? 1 : (n))
-char *imalloc(const int n)
+char *
+imalloc(const int n)
{
return malloc((size_t) nonzero(n));
}
-char *icalloc(int nelem, int elsize)
+char *
+icalloc(int nelem, int elsize)
{
if (nelem == 0 || elsize == 0)
nelem = elsize = 1;
return calloc((size_t) nelem, (size_t) elsize);
}
-void *irealloc(void *pointer, const int size)
+void *
+irealloc(void *pointer, const int size)
{
if (pointer == NULL)
return imalloc(size);
return realloc((void *) pointer, (size_t) nonzero(size));
}
-char *icatalloc(char *old, const char *new)
+char *
+icatalloc(char *old, const char *new)
{
- register char * result;
- register int oldsize, newsize;
+ register char *result;
+ register int oldsize,
+ newsize;
newsize = (new == NULL) ? 0 : strlen(new);
if (old == NULL)
oldsize = 0;
else if (newsize == 0)
return old;
- else oldsize = strlen(old);
+ else
+ oldsize = strlen(old);
if ((result = irealloc(old, oldsize + newsize + 1)) != NULL)
if (new != NULL)
(void) strcpy(result + oldsize, new);
return result;
}
-char *icpyalloc(const char *string)
+char *
+icpyalloc(const char *string)
{
return icatalloc((char *) NULL, string);
}
-void ifree(char *p)
+void
+ifree(char *p)
{
if (p != NULL)
(void) free(p);
}
-void icfree(char *p)
+void
+icfree(char *p)
{
if (p != NULL)
(void) free(p);