struct linebuffer
{
- long size;
+ size_t size;
char *buffer;
};
#define MAIL_PROGRAM_NAME "/bin/mail"
#endif
-static CONST char *my_name;
+static const char *my_name;
static char *the_date;
static char *the_user;
static line_list file_preface;
/* Print error message. `s1' is printf control string, `s2' is arg for it. */
static void
-error (CONST char *s1, CONST char *s2)
+error (const char *s1, const char *s2)
{
printf ("%s: ", my_name);
printf (s1, s2);
/* Print error message and exit. */
static void
-fatal (CONST char *s1, CONST char *s2)
+fatal (const char *s1, const char *s2)
{
error (s1, s2);
exit (1);
/* Like malloc but get fatal error if memory is exhausted. */
-static char *
+static void *
xmalloc (size_t size)
{
- char *result = (char *) malloc (size);
- if (result == ((char *) NULL))
+ void *result = malloc (size);
+ if (result == NULL)
fatal ("virtual memory exhausted", (char *) 0);
return result;
}
-static char *
-xrealloc (char *ptr, size_t size)
+static void *
+xrealloc (void *ptr, size_t size)
{
- char *result = realloc (ptr, ((unsigned) size));
- if (result == ((char *) NULL))
+ void *result = realloc (ptr, size);
+ if (result == NULL)
fatal ("virtual memory exhausted", (char *) 0);
return result;
}
init_linebuffer (struct linebuffer *linebuffer)
{
linebuffer->size = INITIAL_LINE_SIZE;
- linebuffer->buffer = ((char *) xmalloc (INITIAL_LINE_SIZE));
+ linebuffer->buffer = (char *) xmalloc (INITIAL_LINE_SIZE);
}
/* Read a line of text from `stream' into `linebuffer'.
if (p == end)
{
linebuffer->size *= 2;
- buffer = ((char *) xrealloc ((char *) buffer,
- (size_t) (linebuffer->size)));
+ buffer = (char *) xrealloc (buffer, linebuffer->size);
p = buffer + (p - linebuffer->buffer);
end = buffer + linebuffer->size;
linebuffer->buffer = buffer;
has_keyword (char *field)
{
char *ignored;
- return (get_keyword (field, &ignored) != ((char *) NULL));
+ return (get_keyword (field, &ignored) != (char *) NULL);
}
static char *
if (the_stream != ((FILE *) NULL))
{
add_a_stream (the_stream, my_fclose);
- if (the_user == ((char *) NULL))
+ if (the_user == (char *) NULL)
file_preface = make_file_preface ();
write_line_list (file_preface, the_stream);
return true;
}
static void
-put_line (CONST char *string)
+put_line (const char *string)
{
register stream_list rem;
for (rem = the_streams;
rem != ((stream_list) NULL);
rem = rem->rest_streams)
{
- CONST char *s = string;
+ const char *s = string;
int column = 0;
/* Divide STRING into lines. */
while (*s != 0)
{
- CONST char *breakpos;
+ const char *breakpos;
/* Find the last char that fits. */
for (breakpos = s; *breakpos && column < 78; ++breakpos)
my_name = MY_NAME;
the_streams = ((stream_list) NULL);
- the_date = ((char *) NULL);
- the_user = ((char *) NULL);
+ the_date = (char *) NULL;
+ the_user = (char *) NULL;
the_header = read_header ();
command_line = alloc_string ((size_t) (name_length +
the_pipe = popen (command_line, "w");
if (the_pipe == ((FILE *) NULL))
- fatal ("cannot open pipe to real mailer", (char *) 0);
+ fatal ("cannot open pipe to real mailer", (char *) NULL);
add_a_stream (the_pipe, pclose);