{
ARGS *args;
int i;
- args = (ARGS *)malloc(sizeof(ARGS));
+ args = (ARGS *)x_malloc(sizeof(ARGS));
args->argc = 0;
- args->argv = (char **)malloc(sizeof(char *));
+ args->argv = (char **)x_malloc(sizeof(char *));
args->argv[0] = NULL;
for (i=0;i<init_argc;i++) {
args_add(args, init_args[i]);
void args_add(ARGS *args, const char *s)
{
- args->argv = (char**)realloc(args->argv, (args->argc + 2) * sizeof(char *));
- args->argv[args->argc] = strdup(s);
+ args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
+ args->argv[args->argc] = x_strdup(s);
args->argc++;
args->argv[args->argc] = NULL;
}
/* add an argument into the front of the argument list */
void args_add_prefix(ARGS *args, const char *s)
{
- args->argv = (char**)realloc(args->argv, (args->argc + 2) * sizeof(char *));
+ args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
memmove(&args->argv[1], &args->argv[0],
(args->argc+1) * sizeof(args->argv[0]));
- args->argv[0] = strdup(s);
+ args->argv[0] = x_strdup(s);
args->argc++;
}