Nuke ARRAY_SIZE and obsolete razor_set_list_unsatisfied from razor.h.

diff --git a/librazor/razor-internal.h b/librazor/razor-internal.h
index f3e93ae..25e8b67 100644 (file)
--- a/librazor/razor-internal.h
+++ b/librazor/razor-internal.h
@@ -11,6 +11,8 @@
 #define RAZOR_EXPORT
 #endif
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+#define ALIGN(value, base) (((value) + (base - 1)) & ~((base) - 1))
 
 void *zalloc(size_t size);
 
@@ -172,8 +174,6 @@ struct razor_property_iterator {
        struct list *index;
 };
 
-#define ALIGN(value, base) (((value) + (base - 1)) & ~((base) - 1))
-
 struct razor_entry *
 razor_set_find_entry(struct razor_set *set,
                     struct razor_entry *dir, const char *pattern);

diff --git a/librazor/razor.h b/librazor/razor.h
index 4216bc6..4fc3fc7 100644 (file)
--- a/librazor/razor.h
+++ b/librazor/razor.h
@@ -20,8 +20,6 @@
 #ifndef _RAZOR_H_
 #define _RAZOR_H_
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
 enum razor_repo_file_type {
        RAZOR_REPO_FILE_MAIN,
        RAZOR_REPO_FILE_DETAILS,
@@ -159,8 +157,6 @@ razor_property_iterator_destroy(struct razor_property_iterator *pi);
 void razor_set_list_files(struct razor_set *set, const char *prefix);
 void razor_set_list_package_files(struct razor_set *set, const char *name);
 
-void razor_set_list_unsatisfied(struct razor_set *set);
-
 enum razor_diff_action {
        RAZOR_DIFF_ACTION_ADD,
        RAZOR_DIFF_ACTION_REMOVE,

diff --git a/src/main.c b/src/main.c
index bd2df97..4db4289 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,8 @@ static const char install_root[] = "install";
 static const char *repo_filename = system_repo_filename;
 static const char *yum_url;
 
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
 static int
 command_list(int argc, const char *argv[])
 {