undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-03-09 11:58:05 -08:00
parent 7bd7f2804d
commit b4f2a6ac92
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apply.c
View File

@ -651,7 +651,7 @@ static int parse_git_header(char *line, int len, unsigned int size, struct patch
len = linelen(line, size); len = linelen(line, size);
if (!len || line[len-1] != '\n') if (!len || line[len-1] != '\n')
break; break;
for (i = 0; i < sizeof(optable) / sizeof(optable[0]); i++) { for (i = 0; i < ARRAY_SIZE(optable); i++) {
const struct opentry *p = optable + i; const struct opentry *p = optable + i;
int oplen = strlen(p->str); int oplen = strlen(p->str);
if (len < oplen || memcmp(p->str, line, oplen)) if (len < oplen || memcmp(p->str, line, oplen))

4
date.c
View File

@ -123,8 +123,6 @@ static const struct {
{ "IDLE", +12, 0, }, /* International Date Line East */ { "IDLE", +12, 0, }, /* International Date Line East */
}; };
#define NR_TZ (sizeof(timezone_names) / sizeof(timezone_names[0]))
static int match_string(const char *date, const char *str) static int match_string(const char *date, const char *str)
{ {
int i = 0; int i = 0;
@ -173,7 +171,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
} }
} }
for (i = 0; i < NR_TZ; i++) { for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
int match = match_string(date, timezone_names[i].name); int match = match_string(date, timezone_names[i].name);
if (match >= 3) { if (match >= 3) {
int off = timezone_names[i].offset; int off = timezone_names[i].offset;

2
exec_cmd.c
View File

@ -37,7 +37,7 @@ int execv_git_cmd(const char **argv)
getenv("GIT_EXEC_PATH"), getenv("GIT_EXEC_PATH"),
builtin_exec_path }; builtin_exec_path };
for (i = 0; i < sizeof(paths)/sizeof(paths[0]); ++i) { for (i = 0; i < ARRAY_SIZE(paths); ++i) {
const char *exec_dir = paths[i]; const char *exec_dir = paths[i];
const char *tmp; const char *tmp;

2
git-compat-util.h
View File

@ -9,6 +9,8 @@
#endif #endif
#endif #endif
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>

2
git.c
View File

@ -323,8 +323,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
return 0; return 0;
} }
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
static void handle_internal_command(int argc, const char **argv, char **envp) static void handle_internal_command(int argc, const char **argv, char **envp)
{ {
const char *cmd = argv[0]; const char *cmd = argv[0];