[PATCH 3/6] archive: define MAX_ARGS where it's needed
- From
Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
- Date
- Jul 25, 2008, 10:41 UTC
- Message-ID
- <1216982486-5887-3-git-send-email-rene.scharfe@lsrfire.ath.cx>
- In-Reply-To
- <1216982486-5887-2-git-send-email-rene.scharfe@lsrfire.ath.cx>
MAX_EXTRA_ARGS is not used anymore, so remove it. MAX_ARGS is used only in builtin-upload-archive.c, so define it there. Also report the actual value we're comparing against when the number of args is too big.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> --- archive.h | 3 --- builtin-upload-archive.c | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/archive.h b/archive.h index f6ceaeb..929368d 100644 --- a/archive.h +++ b/archive.h @@ -1,9 +1,6 @@ #ifndef ARCHIVE_H #define ARCHIVE_H -#define MAX_EXTRA_ARGS 32 -#define MAX_ARGS (MAX_EXTRA_ARGS + 32) - struct archiver_args { const char *base; size_t baselen; diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c index cc37b36..a9b02fa 100644 --- a/builtin-upload-archive.c +++ b/builtin-upload-archive.c @@ -16,6 +16,7 @@ static const char deadchild[] = static const char lostchild[] = "git upload-archive: archiver process was lost"; +#define MAX_ARGS (64) static int run_upload_archive(int argc, const char **argv, const char *prefix) { @@ -45,7 +46,7 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix) if (len == 0) break; /* got a flush */ if (sent_argc > MAX_ARGS - 2) - die("Too many options (>29)"); + die("Too many options (>%d)", MAX_ARGS - 2); if (p[len-1] == '\n') { p[--len] = 0;
-- 1.6.0.rc0.42.g186458