Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sort_string_list(): rename to string_list_sort()
author
Michael Haggerty
<mhagger@alum.mit.edu>
Tue, 25 Nov 2014 08:02:35 +0000
(09:02 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 25 Nov 2014 18:11:34 +0000
(10:11 -0800)
The new name is more consistent with the names of other
string_list-related functions.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/technical/api-string-list.txt
patch
|
blob
|
history
builtin/apply.c
patch
|
blob
|
history
builtin/receive-pack.c
patch
|
blob
|
history
builtin/remote.c
patch
|
blob
|
history
builtin/repack.c
patch
|
blob
|
history
connect.c
patch
|
blob
|
history
notes.c
patch
|
blob
|
history
remote.c
patch
|
blob
|
history
sha1_file.c
patch
|
blob
|
history
string-list.c
patch
|
blob
|
history
string-list.h
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
8552943
)
diff --git
a/Documentation/technical/api-string-list.txt
b/Documentation/technical/api-string-list.txt
index d51a6579c85f7417708f918cf9807447b1508e3c..c08402b12e88930ca37cce6d3b4537d7f360852f 100644
(file)
--- a/
Documentation/technical/api-string-list.txt
+++ b/
Documentation/technical/api-string-list.txt
@@
-29,7
+29,7
@@
member (you need this if you add things later) and you should set the
`unsorted_string_list_has_string` and get it from the list using
`string_list_lookup` for sorted lists.
`unsorted_string_list_has_string` and get it from the list using
`string_list_lookup` for sorted lists.
-. Can sort an unsorted list using `s
ort_string_lis
t`.
+. Can sort an unsorted list using `s
tring_list_sor
t`.
. Can remove duplicate items from a sorted list using
`string_list_remove_duplicates`.
. Can remove duplicate items from a sorted list using
`string_list_remove_duplicates`.
@@
-146,7
+146,7
@@
write `string_list_insert(...)->util = ...;`.
ownership of a malloc()ed string to a `string_list` that has
`strdup_string` set.
ownership of a malloc()ed string to a `string_list` that has
`strdup_string` set.
-`s
ort_string_lis
t`::
+`s
tring_list_sor
t`::
Sort the list's entries by string value in `strcmp()` order.
Sort the list's entries by string value in `strcmp()` order.
diff --git
a/builtin/apply.c
b/builtin/apply.c
index 6696ea4c3ffd4f7af04f3f56609a78a74a0a0b55..22218f90a6f0b30dc3893f39424643cad84b8372 100644
(file)
--- a/
builtin/apply.c
+++ b/
builtin/apply.c
@@
-4180,7
+4180,7
@@
static int write_out_results(struct patch *list)
if (cpath.nr) {
struct string_list_item *item;
if (cpath.nr) {
struct string_list_item *item;
- s
ort_string_lis
t(&cpath);
+ s
tring_list_sor
t(&cpath);
for_each_string_list_item(item, &cpath)
fprintf(stderr, "U %s\n", item->string);
string_list_clear(&cpath, 0);
for_each_string_list_item(item, &cpath)
fprintf(stderr, "U %s\n", item->string);
string_list_clear(&cpath, 0);
diff --git
a/builtin/receive-pack.c
b/builtin/receive-pack.c
index 32fc540ef3ddfc4d1bb33ae75a0e07b555bdc441..d7ce6437f491655fe973ac04137a14dd2cc26e20 100644
(file)
--- a/
builtin/receive-pack.c
+++ b/
builtin/receive-pack.c
@@
-964,7
+964,7
@@
static void check_aliased_updates(struct command *commands)
string_list_append(&ref_list, cmd->ref_name);
item->util = (void *)cmd;
}
string_list_append(&ref_list, cmd->ref_name);
item->util = (void *)cmd;
}
- s
ort_string_lis
t(&ref_list);
+ s
tring_list_sor
t(&ref_list);
for (cmd = commands; cmd; cmd = cmd->next) {
if (!cmd->error_string)
for (cmd = commands; cmd; cmd = cmd->next) {
if (!cmd->error_string)
diff --git
a/builtin/remote.c
b/builtin/remote.c
index 7fec1702981da6b66fe9df4833af1a0ff14f2847..46ecfd9f7b0dd0b28169341d14132df376e509bc 100644
(file)
--- a/
builtin/remote.c
+++ b/
builtin/remote.c
@@
-352,9
+352,9
@@
static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat
free_refs(stale_refs);
free_refs(fetch_map);
free_refs(stale_refs);
free_refs(fetch_map);
- s
ort_string_lis
t(&states->new);
- s
ort_string_lis
t(&states->tracked);
- s
ort_string_lis
t(&states->stale);
+ s
tring_list_sor
t(&states->new);
+ s
tring_list_sor
t(&states->tracked);
+ s
tring_list_sor
t(&states->stale);
return 0;
}
return 0;
}
@@
-909,7
+909,7
@@
static int get_remote_ref_states(const char *name,
get_push_ref_states(remote_refs, states);
} else {
for_each_ref(append_ref_to_tracked_list, states);
get_push_ref_states(remote_refs, states);
} else {
for_each_ref(append_ref_to_tracked_list, states);
- s
ort_string_lis
t(&states->tracked);
+ s
tring_list_sor
t(&states->tracked);
get_push_ref_states_noquery(states);
}
get_push_ref_states_noquery(states);
}
@@
-1128,7
+1128,7
@@
static int show_all(void)
if (!result) {
int i;
if (!result) {
int i;
- s
ort_string_lis
t(&list);
+ s
tring_list_sor
t(&list);
for (i = 0; i < list.nr; i++) {
struct string_list_item *item = list.items + i;
if (verbose)
for (i = 0; i < list.nr; i++) {
struct string_list_item *item = list.items + i;
if (verbose)
@@
-1333,7
+1333,7
@@
static int prune_remote(const char *remote, int dry_run)
for_each_string_list_item(item, &states.stale)
string_list_append(&refs_to_prune, item->util);
for_each_string_list_item(item, &states.stale)
string_list_append(&refs_to_prune, item->util);
- s
ort_string_lis
t(&refs_to_prune);
+ s
tring_list_sor
t(&refs_to_prune);
if (!dry_run) {
struct strbuf err = STRBUF_INIT;
if (!dry_run) {
struct strbuf err = STRBUF_INIT;
diff --git
a/builtin/repack.c
b/builtin/repack.c
index 28456206c5d135adba191c865e49aa75dc201691..0705d6802faaac96a59fae6107e021ca973d5874 100644
(file)
--- a/
builtin/repack.c
+++ b/
builtin/repack.c
@@
-379,7
+379,7
@@
int cmd_repack(int argc, const char **argv, const char *prefix)
if (delete_redundant) {
int opts = 0;
if (delete_redundant) {
int opts = 0;
- s
ort_string_lis
t(&names);
+ s
tring_list_sor
t(&names);
for_each_string_list_item(item, &existing_packs) {
char *sha1;
size_t len = strlen(item->string);
for_each_string_list_item(item, &existing_packs) {
char *sha1;
size_t len = strlen(item->string);
diff --git
a/connect.c
b/connect.c
index d47d0ec6040fdb8b07a689e299dac121bb468717..16f74b0ad380b02f1b42d0b12e1e09c98e63a603 100644
(file)
--- a/
connect.c
+++ b/
connect.c
@@
-93,7
+93,7
@@
static void annotate_refs_with_symref_info(struct ref *ref)
parse_one_symref_info(&symref, val, len);
feature_list = val + 1;
}
parse_one_symref_info(&symref, val, len);
feature_list = val + 1;
}
- s
ort_string_lis
t(&symref);
+ s
tring_list_sor
t(&symref);
for (; ref; ref = ref->next) {
struct string_list_item *item;
for (; ref; ref = ref->next) {
struct string_list_item *item;
diff --git
a/notes.c
b/notes.c
index 5fe691dbcdfb9e3f9fa3c768f243234d5bb2e816..40f44183780eef5939daba3b3b555f7fa9340c62 100644
(file)
--- a/
notes.c
+++ b/
notes.c
@@
-902,7
+902,7
@@
int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
if (string_list_add_note_lines(&sort_uniq_list, new_sha1))
goto out;
string_list_remove_empty_items(&sort_uniq_list, 0);
if (string_list_add_note_lines(&sort_uniq_list, new_sha1))
goto out;
string_list_remove_empty_items(&sort_uniq_list, 0);
- s
ort_string_lis
t(&sort_uniq_list);
+ s
tring_list_sor
t(&sort_uniq_list);
string_list_remove_duplicates(&sort_uniq_list, 0);
/* create a new blob object from sort_uniq_list */
string_list_remove_duplicates(&sort_uniq_list, 0);
/* create a new blob object from sort_uniq_list */
diff --git
a/remote.c
b/remote.c
index f62421702f66bb9b8f64247dd339d01f2fbfb4c1..ae4ecfa1163137f7372fd02a51dc8a93319d218f 100644
(file)
--- a/
remote.c
+++ b/
remote.c
@@
-1356,7
+1356,7
@@
static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***ds
}
clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
}
clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK);
- s
ort_string_lis
t(&dst_tag);
+ s
tring_list_sor
t(&dst_tag);
/* Collect tags they do not have. */
for (ref = src; ref; ref = ref->next) {
/* Collect tags they do not have. */
for (ref = src; ref; ref = ref->next) {
@@
-1421,7
+1421,7
@@
static void prepare_ref_index(struct string_list *ref_index, struct ref *ref)
for ( ; ref; ref = ref->next)
string_list_append_nodup(ref_index, ref->name)->util = ref;
for ( ; ref; ref = ref->next)
string_list_append_nodup(ref_index, ref->name)->util = ref;
- s
ort_string_lis
t(ref_index);
+ s
tring_list_sor
t(ref_index);
}
/*
}
/*
@@
-2135,7
+2135,7
@@
struct ref *get_stale_heads(struct refspec *refs, int ref_count, struct ref *fet
info.ref_count = ref_count;
for (ref = fetch_map; ref; ref = ref->next)
string_list_append(&ref_names, ref->name);
info.ref_count = ref_count;
for (ref = fetch_map; ref; ref = ref->next)
string_list_append(&ref_names, ref->name);
- s
ort_string_lis
t(&ref_names);
+ s
tring_list_sor
t(&ref_names);
for_each_ref(get_stale_heads_cb, &info);
string_list_clear(&ref_names, 0);
return stale_refs;
for_each_ref(get_stale_heads_cb, &info);
string_list_clear(&ref_names, 0);
return stale_refs;
diff --git
a/sha1_file.c
b/sha1_file.c
index d7f1838c13f5a88448d0f2034347bfb6482b3edf..30995e61b38fbfd1733acc5c3c5866b61d9f09e1 100644
(file)
--- a/
sha1_file.c
+++ b/
sha1_file.c
@@
-1198,7
+1198,7
@@
static void report_pack_garbage(struct string_list *list)
if (!report_garbage)
return;
if (!report_garbage)
return;
- s
ort_string_lis
t(list);
+ s
tring_list_sor
t(list);
for (i = 0; i < list->nr; i++) {
const char *path = list->items[i].string;
for (i = 0; i < list->nr; i++) {
const char *path = list->items[i].string;
diff --git
a/string-list.c
b/string-list.c
index c5aa0765e8e0a044e9e84e43280d5964f232ef63..2f69c32a8abdc2e1490ff1bf5948a8ec2260150c 100644
(file)
--- a/
string-list.c
+++ b/
string-list.c
@@
-220,7
+220,7
@@
struct string_list_item *string_list_append(struct string_list *list,
/* Yuck */
static compare_strings_fn compare_for_qsort;
/* Yuck */
static compare_strings_fn compare_for_qsort;
-/* Only call this from inside s
ort_string_lis
t! */
+/* Only call this from inside s
tring_list_sor
t! */
static int cmp_items(const void *a, const void *b)
{
const struct string_list_item *one = a;
static int cmp_items(const void *a, const void *b)
{
const struct string_list_item *one = a;
@@
-228,7
+228,7
@@
static int cmp_items(const void *a, const void *b)
return compare_for_qsort(one->string, two->string);
}
return compare_for_qsort(one->string, two->string);
}
-void s
ort_string_lis
t(struct string_list *list)
+void s
tring_list_sor
t(struct string_list *list)
{
compare_for_qsort = list->cmp ? list->cmp : strcmp;
qsort(list->items, list->nr, sizeof(*list->items), cmp_items);
{
compare_for_qsort = list->cmp ? list->cmp : strcmp;
qsort(list->items, list->nr, sizeof(*list->items), cmp_items);
diff --git
a/string-list.h
b/string-list.h
index 494eb5d95de0e5e8d69705f7a6f4fe2efcb232ad..2cc5e4842766d03b8fd67af1a80440d94c467742 100644
(file)
--- a/
string-list.h
+++ b/
string-list.h
@@
-85,7
+85,7
@@
struct string_list_item *string_list_append(struct string_list *list, const char
*/
struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
*/
struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
-void s
ort_string_lis
t(struct string_list *list);
+void s
tring_list_sor
t(struct string_list *list);
int unsorted_string_list_has_string(struct string_list *list, const char *string);
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string);
int unsorted_string_list_has_string(struct string_list *list, const char *string);
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string);