[SCM] dpkg's main repository branch, master, updated. 1.16.0.3-270-g89973c5

[Guillem Jover]

The following commit has been merged in the master branch:
commit 31242e1aaabe7750b2b68ee96306e2cbdfd767bb
Author: Guillem Jover <guil...@debian.org>
Date:   Sat Aug 20 12:30:35 2011 +0200

    u-a: Rename get_all_alternatives() to altdb_get_namelist()
    
    This makes it clear we are referring to the filenames in the database
    directory.

diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 9b0548a..0bea4b5 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -399,7 +399,7 @@ filter_altdir(const struct dirent *entry)
 }
 
 static int
-get_all_alternatives(struct dirent ***table)
+altdb_get_namelist(struct dirent ***table)
 {
        int count;
 
@@ -480,7 +480,7 @@ config_all(void)
        struct dirent **table;
        int i, count;
 
-       count = get_all_alternatives(&table);
+       count = altdb_get_namelist(&table);
        for (i = 0; i < count; i++) {
                subcall(prog_path, "--config", table[i]->d_name, NULL);
                printf("\n");
@@ -2204,7 +2204,7 @@ main(int argc, char **argv)
        alt_map_obj = alternative_map_new(NULL, NULL);
        alt_map_links = alternative_map_new(NULL, NULL);
        alt_map_parent = alternative_map_new(NULL, NULL);
-       count = get_all_alternatives(&table);
+       count = altdb_get_namelist(&table);
        for (i = 0; i < count; i++) {
                struct slave_link *sl;
                struct alternative *a_new = alternative_new(table[i]->d_name);

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org