added args_pop() for neater args processing

diff --git a/args.c b/args.c
index 636b903f82edc447d656eb02fd33196db8cb91ad..d0defd2c86e5a0c7e23b45ed4ef615064a778f73 100644 (file)
--- a/args.c
+++ b/args.c
@@ -39,3 +39,8 @@ void args_add(ARGS *args, const char *s)
        args->argv[args->argc] = NULL;
 }
 
+void args_pop(ARGS *args, int n)
+{
+       args->argc -= n;
+       args->argv[args->argc] = NULL;
+}

diff --git a/ccache.c b/ccache.c
index aa7e881a705c459d082074a77aacd4388944656e..8ec652ae17150ceb23b41d588c90144ad1e149c3 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -55,7 +55,7 @@ static void to_cache(ARGS *args)
        args_add(args, "-o");
        args_add(args, tmp_hashname);
        status = execute(args->argv, tmp_stdout, tmp_stderr);
-       args->argc -= 2;
+       args_pop(args, 2);
 
        if (stat(tmp_stdout, &st) != 0 || st.st_size != 0) {
                cc_log("compiler produced stdout for %s\n", output_file);
@@ -204,7 +204,7 @@ static void find_hash(ARGS *args)
 
        args_add(args, "-E");
        status = execute(args->argv, path_stdout, path_stderr);
-       args->argc--;
+       args_pop(args, 1);
 
        if (status != 0) {
                unlink(path_stdout);

diff --git a/ccache.h b/ccache.h
index 3b51d77dfd4b5f97d04fab9d0b4ca5e1473c708f..1557531528541b2d99223fbe0aed694145e0b887 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -52,3 +52,5 @@ typedef struct {
 
 ARGS *args_init(void);
 void args_add(ARGS *args, const char *s);
+void args_pop(ARGS *args, int n);
+