Rename path_list to string_list
The name path_list was correct for the first usage of that data structure, but it really is a general-purpose string list. $ perl -i -pe 's/path-list/string-list/g' $(git grep -l path-list) $ perl -i -pe 's/path_list/string_list/g' $(git grep -l path_list) $ git mv path-list.h string-list.h $ git mv path-list.c string-list.c $ perl -i -pe 's/has_path/has_string/g' $(git grep -l has_path) $ perl -i -pe 's/path/string/g' string-list.[ch] $ git mv Documentation/technical/api-path-list.txt \ Documentation/technical/api-string-list.txt $ perl -i -pe 's/strdup_paths/strdup_strings/g' $(git grep -l strdup_paths) ... and then fix all users of string-list to access the member "string" instead of "path". Documentation/technical/api-string-list.txt needed some rewrapping, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
51ef1daa4a
commit
c455c87c5c
12
mailmap.c
12
mailmap.c
@ -1,8 +1,8 @@
|
||||
#include "cache.h"
|
||||
#include "path-list.h"
|
||||
#include "string-list.h"
|
||||
#include "mailmap.h"
|
||||
|
||||
int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev)
|
||||
int read_mailmap(struct string_list *map, const char *filename, char **repo_abbrev)
|
||||
{
|
||||
char buffer[1024];
|
||||
FILE *f = fopen(filename, "r");
|
||||
@ -54,16 +54,16 @@ int read_mailmap(struct path_list *map, const char *filename, char **repo_abbrev
|
||||
for (i = 0; i < right_bracket - left_bracket - 1; i++)
|
||||
email[i] = tolower(left_bracket[i + 1]);
|
||||
email[right_bracket - left_bracket - 1] = '\0';
|
||||
path_list_insert(email, map)->util = name;
|
||||
string_list_insert(email, map)->util = name;
|
||||
}
|
||||
fclose(f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int map_email(struct path_list *map, const char *email, char *name, int maxlen)
|
||||
int map_email(struct string_list *map, const char *email, char *name, int maxlen)
|
||||
{
|
||||
char *p;
|
||||
struct path_list_item *item;
|
||||
struct string_list_item *item;
|
||||
char buf[1024], *mailbuf;
|
||||
int i;
|
||||
|
||||
@ -80,7 +80,7 @@ int map_email(struct path_list *map, const char *email, char *name, int maxlen)
|
||||
for (i = 0; i < p - email; i++)
|
||||
mailbuf[i] = tolower(email[i]);
|
||||
mailbuf[i] = 0;
|
||||
item = path_list_lookup(mailbuf, map);
|
||||
item = string_list_lookup(mailbuf, map);
|
||||
if (mailbuf != buf)
|
||||
free(mailbuf);
|
||||
if (item != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user