← Back to branch summary

~ubuntu-branches/debian/lenny/ccache/lenny

« back to all changes in this revision

Viewing changes to args.c

  • Committer: Bazaar Package Importer
  • Author(s): Francois Marier
  • Date: 2005-06-26 13:33:19 UTC
  • mto: (2.1.1 breezy)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20050626133319-pcu2jrgcmep18yai
Tags: upstream-2.4
Import upstream version 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
args.c
24
24
{
25
25
        ARGS *args;
26
26
        int i;
27
 
        args = (ARGS *)malloc(sizeof(ARGS));
 
27
        args = (ARGS *)x_malloc(sizeof(ARGS));
28
28
        args->argc = 0;
29
 
        args->argv = (char **)malloc(sizeof(char *));
 
29
        args->argv = (char **)x_malloc(sizeof(char *));
30
30
        args->argv[0] = NULL;
31
31
        for (i=0;i<init_argc;i++) {
32
32
                args_add(args, init_args[i]);
37
37
 
38
38
void args_add(ARGS *args, const char *s)
39
39
{
40
 
        args->argv = (char**)realloc(args->argv, (args->argc + 2) * sizeof(char *));
41
 
        args->argv[args->argc] = strdup(s);
 
40
        args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
 
41
        args->argv[args->argc] = x_strdup(s);
42
42
        args->argc++;
43
43
        args->argv[args->argc] = NULL;
44
44
}
66
66
/* add an argument into the front of the argument list */
67
67
void args_add_prefix(ARGS *args, const char *s)
68
68
{
69
 
        args->argv = (char**)realloc(args->argv, (args->argc + 2) * sizeof(char *));
 
69
        args->argv = (char**)x_realloc(args->argv, (args->argc + 2) * sizeof(char *));
70
70
        memmove(&args->argv[1], &args->argv[0], 
71
71
                (args->argc+1) * sizeof(args->argv[0]));
72
 
        args->argv[0] = strdup(s);
 
72
        args->argv[0] = x_strdup(s);
73
73
        args->argc++;
74
74
}
75
75