Commit d0d81164 authored by John van Groningen's avatar John van Groningen
Browse files

refactor ipc.c for unix to prevent c compiler warnings

parent 2d51e2dc
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# include <stdio.h> # include <stdio.h>
# include <stdlib.h> # include <stdlib.h>
# include <stdarg.h> # include <stdarg.h>
# include <strings.h> # include <string.h>
/* /*
Clean string Clean string
...@@ -23,19 +23,18 @@ typedef struct clean_string {long length; char chars [1]; } *CleanString; ...@@ -23,19 +23,18 @@ typedef struct clean_string {long length; char chars [1]; } *CleanString;
# define Clean(ignore) # define Clean(ignore)
# include "ipc.h" # include "ipc.h"
#ifdef DEBUG
static void static void
log (char *format, ...) add_to_log (char *format, ...)
{ {
#ifdef DEBUG
va_list ap; va_list ap;
va_start (ap, format); va_start (ap, format);
(void) fputs(" cocl: ", stderr); (void) fputs(" cocl: ", stderr);
(void) vfprintf(stderr, format, ap); (void) vfprintf(stderr, format, ap);
va_end(ap); va_end(ap);
#else /* ifndef DEBUG */
#endif
} }
#endif
static char * static char *
ConvertCleanString (CleanString string) ConvertCleanString (CleanString string)
...@@ -55,24 +54,6 @@ static FILE *commands, *results; ...@@ -55,24 +54,6 @@ static FILE *commands, *results;
static char *command_buffer_p=NULL; static char *command_buffer_p=NULL;
static int command_buffer_size=0; static int command_buffer_size=0;
static void
crash (void)
{
int *p;
p = NULL;
log ("crashing\n");
*p = 0;
} /* crash */
static void
hang (void)
{
log ("hanging\n");
for (;;)
;
} /* hang */
int open_pipes (CleanString commands_clean, CleanString results_clean) int open_pipes (CleanString commands_clean, CleanString results_clean)
{ {
char *commands_name, *results_name; char *commands_name, *results_name;
...@@ -82,13 +63,17 @@ int open_pipes (CleanString commands_clean, CleanString results_clean) ...@@ -82,13 +63,17 @@ int open_pipes (CleanString commands_clean, CleanString results_clean)
if ((commands = fopen(commands_name, "r")) == NULL) if ((commands = fopen(commands_name, "r")) == NULL)
{ {
log("commands = %s\n",commands_name); #ifdef DEBUG
add_to_log("commands = %s\n",commands_name);
#endif
perror("fopen commands"); perror("fopen commands");
return -1; return -1;
} }
if ((results = fopen(results_name, "w")) == NULL) if ((results = fopen(results_name, "w")) == NULL)
{ {
log("results = %s\n",results_name); #ifdef DEBUG
add_to_log("results = %s\n",results_name);
#endif
perror("fopen results"); perror("fopen results");
return -1; return -1;
} }
...@@ -97,7 +82,9 @@ int open_pipes (CleanString commands_clean, CleanString results_clean) ...@@ -97,7 +82,9 @@ int open_pipes (CleanString commands_clean, CleanString results_clean)
int get_command_length (void) int get_command_length (void)
{ {
log ("reading command\n"); #ifdef DEBUG
add_to_log ("reading command\n");
#endif
if (command_buffer_p==NULL){ if (command_buffer_p==NULL){
command_buffer_p = malloc (1024); command_buffer_p = malloc (1024);
...@@ -133,7 +120,9 @@ int get_command_length (void) ...@@ -133,7 +120,9 @@ int get_command_length (void)
command_buffer_p[n_chars]='\0'; command_buffer_p[n_chars]='\0';
log ("command = %s", command_buffer_p); #ifdef DEBUG
add_to_log ("command = %s", command_buffer_p);
#endif
return n_chars; return n_chars;
} }
...@@ -141,7 +130,10 @@ int get_command_length (void) ...@@ -141,7 +130,10 @@ int get_command_length (void)
int get_command (CleanString cleanString) int get_command (CleanString cleanString)
{ {
log ("%s\n", command_buffer_p); #ifdef DEBUG
add_to_log ("%s\n", command_buffer_p);
#endif
strncpy (cleanString->chars, command_buffer_p, cleanString->length); strncpy (cleanString->chars, command_buffer_p, cleanString->length);
return (0); return (0);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment