*/
-#include <../src/config.h>
+#include <config.h>
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
-#if __STDC__ || defined(STDC_HEADERS)
-# include <stdlib.h>
-#else
-char *malloc ();
-char *getenv ();
-#endif
-static void *xmalloc (unsigned int);
-static void *xrealloc (char *ptr, unsigned int);
+static void *xmalloc (size_t);
+static void *xrealloc (void *, size_t);
static void skip_to_lf (FILE *stream);
static void fatal (CONST char *s1, CONST char *s2);
static void error (CONST char *s1, CONST char *s2);
char name[14];
int c;
- hd = (char *) getenv ("HOME");
+ hd = getenv ("HOME");
md = (char *) xmalloc (strlen (hd) + 10);
strcpy (md, hd);
}
static void
-skip_to_lf (stream)
- FILE *stream;
+skip_to_lf (FILE *stream)
{
register int c;
while ((c = getc(stream)) != '\n')
}
static void *
-xmalloc (size)
- unsigned size;
+xmalloc (size_t size)
{
- char *result = (char *) malloc (size);
+ void *result = malloc (size);
if (!result)
fatal ("virtual memory exhausted", 0);
return result;
}
static void *
-xrealloc (ptr, size)
- char *ptr;
- unsigned size;
+xrealloc (void *ptr, size_t size)
{
- char *result = (char *) realloc (ptr, size);
+ void *result = realloc (ptr, size);
if (!result)
fatal ("virtual memory exhausted", 0);
return result;