Another code refactoring

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9013ce9..b9934c8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,13 +110,13 @@ ENDIF (RPMIO_LIBRARY)
 
 # Get package version
 FILE(READ src/version.h CURRENT_VERSION_H)
-STRING(REGEX MATCH "\#define[ \t]+CR_MAJOR_VERSION[ \t]+([0-9]+)"
+STRING(REGEX MATCH "\#define[ \t]+CR_MAJOR_VERSION[ \t]+([0-9]+).*"
        MAJOR_VERSION ${CURRENT_VERSION_H})
 SET(CPACK_PACKAGE_VERSION_MAJOR ${CMAKE_MATCH_1})
-STRING(REGEX MATCH "\#define[ \t]+CR_MINOR_VERSION[ \t]+([0-9]+)"
+STRING(REGEX MATCH "\#define[ \t]+CR_MINOR_VERSION[ \t]+([0-9]+).*"
        MINOR_VERSION ${CURRENT_VERSION_H})
 SET(CPACK_PACKAGE_VERSION_MINOR ${CMAKE_MATCH_1})
-STRING(REGEX MATCH "\#define[ \t]+CR_PATCH_VERSION[ \t]+([0-9]+)"
+STRING(REGEX MATCH "\#define[ \t]+CR_PATCH_VERSION[ \t]+([0-9]+).*"
        PATCH_VERSION ${CURRENT_VERSION_H})
 SET(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
 

diff --git a/src/compression_wrapper.h b/src/compression_wrapper.h
index dab27de..19271ff 100644 (file)
--- a/src/compression_wrapper.h
+++ b/src/compression_wrapper.h
@@ -90,7 +90,7 @@ CR_FILE *cr_open(const char *filename,
 
 /** \ingroup compression_wrapper
  * Reads an array of len bytes from the CR_FILE.
- * @param CR_FILE       CR_FILE pointer
+ * @param cr_file       CR_FILE pointer
  * @param buffer        target buffer
  * @param len           number of bytes to read
  * @return              CR_CW_OK or CR_CW_ERR
@@ -99,7 +99,7 @@ int cr_read(CR_FILE *cr_file, void *buffer, unsigned int len);
 
 /** \ingroup compression_wrapper
  * Writes the array of len bytes from buffer to the cr_file.
- * @param CR_FILE       CR_FILE pointer
+ * @param cr_file       CR_FILE pointer
  * @param buffer        source buffer
  * @param len           number of bytes to read
  * @return              number of uncompressed bytes readed (0 = EOF)
@@ -109,7 +109,7 @@ int cr_write(CR_FILE *cr_file, const void *buffer, unsigned int len);
 
 /** \ingroup compression_wrapper
  * Writes the string pointed by str into the cr_file.
- * @param CR_FILE       CR_FILE pointer
+ * @param cr_file       CR_FILE pointer
  * @param str           null terminated ('\0') string
  * @return              number of uncompressed bytes writed or CR_CW_ERR
  */
@@ -117,7 +117,7 @@ int cr_puts(CR_FILE *cr_file, const char *str);
 
 /** \ingroup compression_wrapper
  * Writes a formatted string into the cr_file.
- * @param CR_FILE       CR_FILE pointer
+ * @param cr_file       CR_FILE pointer
  * @param format        format string
  * @param ...           list of additional arguments as specified in format
  * @return              CR_CW_OK or CR_CW_ERR
@@ -126,7 +126,7 @@ int cr_printf(CR_FILE *cr_file, const char *format, ...);
 
 /** \ingroup compression_wrapper
  * Closes the CR_FILE.
- * @param CR_FILE       CR_FILE pointer
+ * @param cr_file       CR_FILE pointer
  * @return              CR_CW_OK or CR_CW_ERR
  */
 int cr_close(CR_FILE *cr_file);

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index a20e450..b8ccde5 100644 (file)
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -795,9 +795,9 @@ main(int argc, char **argv)
 
     // XML
 
-    cr_fill_missing_data(out_dir, pri_xml_rec, &(cmd_options->checksum_type));
-    cr_fill_missing_data(out_dir, fil_xml_rec, &(cmd_options->checksum_type));
-    cr_fill_missing_data(out_dir, oth_xml_rec, &(cmd_options->checksum_type));
+    cr_fill_repomdrecord(out_dir, pri_xml_rec, &(cmd_options->checksum_type));
+    cr_fill_repomdrecord(out_dir, fil_xml_rec, &(cmd_options->checksum_type));
+    cr_fill_repomdrecord(out_dir, oth_xml_rec, &(cmd_options->checksum_type));
 
 
     // Groupfile
@@ -809,9 +809,11 @@ main(int argc, char **argv)
         groupfile_rec = cr_new_repomdrecord(groupfile_name);
         compressed_groupfile_rec = cr_new_repomdrecord(groupfile_name);
 
-        cr_process_groupfile(out_dir, groupfile_rec, compressed_groupfile_rec,
-                             &(cmd_options->checksum_type),
-                             groupfile_compression);
+        cr_process_groupfile_repomdrecord(out_dir,
+                                          groupfile_rec,
+                                          compressed_groupfile_rec,
+                                          &(cmd_options->checksum_type),
+                                          groupfile_compression);
         g_free(groupfile_name);
     }
 
@@ -872,9 +874,9 @@ main(int argc, char **argv)
         fil_db_rec = cr_new_repomdrecord(fil_db_name);
         oth_db_rec = cr_new_repomdrecord(oth_db_name);
 
-        cr_fill_missing_data(out_dir, pri_db_rec, &(cmd_options->checksum_type));
-        cr_fill_missing_data(out_dir, fil_db_rec, &(cmd_options->checksum_type));
-        cr_fill_missing_data(out_dir, oth_db_rec, &(cmd_options->checksum_type));
+        cr_fill_repomdrecord(out_dir, pri_db_rec, &(cmd_options->checksum_type));
+        cr_fill_repomdrecord(out_dir, fil_db_rec, &(cmd_options->checksum_type));
+        cr_fill_repomdrecord(out_dir, oth_db_rec, &(cmd_options->checksum_type));
 
         g_free(pri_db_name);
         g_free(fil_db_name);
@@ -885,23 +887,29 @@ main(int argc, char **argv)
     // Add checksums into files names
 
     if (cmd_options->unique_md_filenames) {
-        cr_rename_file(out_dir, pri_xml_rec);
-        cr_rename_file(out_dir, fil_xml_rec);
-        cr_rename_file(out_dir, oth_xml_rec);
-        cr_rename_file(out_dir, pri_db_rec);
-        cr_rename_file(out_dir, fil_db_rec);
-        cr_rename_file(out_dir, oth_db_rec);
-        cr_rename_file(out_dir, groupfile_rec);
-        cr_rename_file(out_dir, compressed_groupfile_rec);
+        cr_rename_repomdrecord_file(out_dir, pri_xml_rec);
+        cr_rename_repomdrecord_file(out_dir, fil_xml_rec);
+        cr_rename_repomdrecord_file(out_dir, oth_xml_rec);
+        cr_rename_repomdrecord_file(out_dir, pri_db_rec);
+        cr_rename_repomdrecord_file(out_dir, fil_db_rec);
+        cr_rename_repomdrecord_file(out_dir, oth_db_rec);
+        cr_rename_repomdrecord_file(out_dir, groupfile_rec);
+        cr_rename_repomdrecord_file(out_dir, compressed_groupfile_rec);
     }
 
 
     // Gen xml
 
-    char *repomd_xml = cr_xml_repomd(out_dir, pri_xml_rec, fil_xml_rec,
-                                     oth_xml_rec, pri_db_rec, fil_db_rec,
-                                     oth_db_rec, groupfile_rec,
-                                     compressed_groupfile_rec, NULL);
+    char *repomd_xml = cr_generate_repomd_xml(out_dir,
+                                              pri_xml_rec,
+                                              fil_xml_rec,
+                                              oth_xml_rec,
+                                              pri_db_rec,
+                                              fil_db_rec,
+                                              oth_db_rec,
+                                              groupfile_rec,
+                                              compressed_groupfile_rec,
+                                              NULL);
     gchar *repomd_path = g_strconcat(out_repo, "repomd.xml", NULL);
 
 

diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index 5390386..9edced1 100644 (file)
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -379,7 +379,7 @@ add_package(cr_Package *pkg,
 
                 // NVR merge method
                 } else if (merge_method == MM_NVR) {
-                    int cmp_res = cr_cmp_version_string(pkg->version, c_pkg->version);
+                    int cmp_res = cr_cmp_version_str(pkg->version, c_pkg->version);
                     long pkg_release   = (pkg->release)   ? strtol(pkg->release, NULL, 10)   : 0;
                     long c_pkg_release = (c_pkg->release) ? strtol(c_pkg->release, NULL, 10) : 0;
 
@@ -402,7 +402,7 @@ add_package(cr_Package *pkg,
 
                 // Two packages has same name and arch but all param is used
 
-                int cmp_res = cr_cmp_version_string(pkg->version, c_pkg->version);
+                int cmp_res = cr_cmp_version_str(pkg->version, c_pkg->version);
                 long pkg_release   = (pkg->release)   ? strtol(pkg->release, NULL, 10)   : 0;
                 long c_pkg_release = (c_pkg->release) ? strtol(c_pkg->release, NULL, 10) : 0;
 
@@ -703,9 +703,9 @@ dump_merged_metadata(GHashTable *merged_hashtable,
 
     // XML
 
-    cr_fill_missing_data(out_dir, pri_xml_rec, NULL);
-    cr_fill_missing_data(out_dir, fil_xml_rec, NULL);
-    cr_fill_missing_data(out_dir, oth_xml_rec, NULL);
+    cr_fill_repomdrecord(out_dir, pri_xml_rec, NULL);
+    cr_fill_repomdrecord(out_dir, fil_xml_rec, NULL);
+    cr_fill_repomdrecord(out_dir, oth_xml_rec, NULL);
 
 
     // Groupfile
@@ -716,8 +716,11 @@ dump_merged_metadata(GHashTable *merged_hashtable,
         groupfile_rec = cr_new_repomdrecord(groupfile_name);
         compressed_groupfile_rec = cr_new_repomdrecord(groupfile_name);
 
-        cr_process_groupfile(out_dir, groupfile_rec, compressed_groupfile_rec,
-                             NULL, cmd_options->groupfile_compression_type);
+        cr_process_groupfile_repomdrecord(out_dir,
+                                          groupfile_rec,
+                                          compressed_groupfile_rec,
+                                          NULL,
+                                          cmd_options->groupfile_compression_type);
         g_free(groupfile_name);
     }
 
@@ -728,7 +731,7 @@ dump_merged_metadata(GHashTable *merged_hashtable,
         gchar *update_info_name = g_strconcat("repodata/updateinfo.xml",
                                               groupfile_suffix, NULL);
         update_info_rec = cr_new_repomdrecord(update_info_name);
-        cr_fill_missing_data(out_dir, update_info_rec, NULL);
+        cr_fill_repomdrecord(out_dir, update_info_rec, NULL);
         g_free(update_info_name);
     }
 
@@ -772,31 +775,37 @@ dump_merged_metadata(GHashTable *merged_hashtable,
         g_free(fil_db_name);
         g_free(oth_db_name);
 
-        cr_fill_missing_data(out_dir, pri_db_rec, NULL);
-        cr_fill_missing_data(out_dir, fil_db_rec, NULL);
-        cr_fill_missing_data(out_dir, oth_db_rec, NULL);
+        cr_fill_repomdrecord(out_dir, pri_db_rec, NULL);
+        cr_fill_repomdrecord(out_dir, fil_db_rec, NULL);
+        cr_fill_repomdrecord(out_dir, oth_db_rec, NULL);
     }
 
 
     // Add checksums into files names
 
-    cr_rename_file(out_dir, pri_xml_rec);
-    cr_rename_file(out_dir, fil_xml_rec);
-    cr_rename_file(out_dir, oth_xml_rec);
-    cr_rename_file(out_dir, pri_db_rec);
-    cr_rename_file(out_dir, fil_db_rec);
-    cr_rename_file(out_dir, oth_db_rec);
-    cr_rename_file(out_dir, groupfile_rec);
-    cr_rename_file(out_dir, compressed_groupfile_rec);
-    cr_rename_file(out_dir, update_info_rec);
+    cr_rename_repomdrecord_file(out_dir, pri_xml_rec);
+    cr_rename_repomdrecord_file(out_dir, fil_xml_rec);
+    cr_rename_repomdrecord_file(out_dir, oth_xml_rec);
+    cr_rename_repomdrecord_file(out_dir, pri_db_rec);
+    cr_rename_repomdrecord_file(out_dir, fil_db_rec);
+    cr_rename_repomdrecord_file(out_dir, oth_db_rec);
+    cr_rename_repomdrecord_file(out_dir, groupfile_rec);
+    cr_rename_repomdrecord_file(out_dir, compressed_groupfile_rec);
+    cr_rename_repomdrecord_file(out_dir, update_info_rec);
 
 
     // Gen repomd.xml content
 
-    char *repomd_xml = cr_xml_repomd(out_dir, pri_xml_rec,
-                                     fil_xml_rec, oth_xml_rec, pri_db_rec,
-                                     fil_db_rec, oth_db_rec, groupfile_rec,
-                                     compressed_groupfile_rec, update_info_rec);
+    char *repomd_xml = cr_generate_repomd_xml(out_dir,
+                                              pri_xml_rec,
+                                              fil_xml_rec,
+                                              oth_xml_rec,
+                                              pri_db_rec,
+                                              fil_db_rec,
+                                              oth_db_rec,
+                                              groupfile_rec,
+                                              compressed_groupfile_rec,
+                                              update_info_rec);
 
     if (repomd_xml) {
         gchar *repomd_path = g_strconcat(cmd_options->out_repo, "repomd.xml", NULL);

diff --git a/src/misc.c b/src/misc.c
index e118471..6e1ea99 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -40,7 +40,7 @@
 
 
 const char *
-cr_flag_to_string(gint64 flags)
+cr_flag_to_str(gint64 flags)
 {
     flags &= 0xf;
     switch(flags) {
@@ -76,7 +76,7 @@ cr_flag_to_string(gint64 flags)
  *
  */
 struct cr_EVR
-cr_string_to_version(const char *string, GStringChunk *chunk)
+cr_str_to_evr(const char *string, GStringChunk *chunk)
 {
     struct cr_EVR evr;
     evr.epoch = NULL;
@@ -789,7 +789,7 @@ cr_str_to_version(const char *str)
 // 1 - first string is bigger version
 // 2 - second string is bigger version
 int
-cr_cmp_version_string(const char* str1, const char *str2)
+cr_cmp_version_str(const char* str1, const char *str2)
 {
     struct cr_Version ver1, ver2;
 

diff --git a/src/misc.h b/src/misc.h
index 1d2418d..d4efed6 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -43,7 +43,7 @@ extern "C" {
  * @param flags         flags
  * @return              flags as constant string
  */
-const char *cr_flag_to_string(gint64 flags);
+const char *cr_flag_to_str(gint64 flags);
 
 /** \ingroup misc
  * Epoch-Version-Release representation.
@@ -75,7 +75,7 @@ struct cr_Version {
  * @param chunk         string chunk for strings (optional - could be NULL)
  * @return              filled NVR
  */
-struct cr_EVR cr_string_to_version(const char *string, GStringChunk *chunk);
+struct cr_EVR cr_str_to_evr(const char *string, GStringChunk *chunk);
 
 /** \ingroup misc
  * Check if the filename match pattern for primary files (files listed
@@ -167,6 +167,7 @@ int cr_copy_file(const char *src, const char *dst);
  * @param dst           destination (If dst is dir, filename of src +
  *                      compression suffix is used.
  *                      If dst is NULL, src + compression suffix is used)
+ * @param compression   type of compression
  * @return              CR_COPY_OK or CR_COPY_ERR on error
  */
 int cr_compress_file(const char *src,
@@ -209,7 +210,7 @@ struct cr_Version cr_str_to_version(const char *str);
  * @return              0 - versions are same, 1 - first string is bigger
  *                      version, 2 - second string is bigger version
  */
-int cr_cmp_version_string(const char* str1, const char *str2);
+int cr_cmp_version_str(const char* str1, const char *str2);
 
 /** \ingroup misc
  * Logging function with no output.

diff --git a/src/package.h b/src/package.h
index 4e6c48a..3a75488 100644 (file)
--- a/src/package.h
+++ b/src/package.h
@@ -36,7 +36,7 @@ extern "C" {
  */
 typedef struct {
     char *name;                 /*!< name */
-    char *flags;                /*!< flags (value returned by cr_flag_to_string()
+    char *flags;                /*!< flags (value returned by cr_flag_to_str()
                                      from misc module) */
     char *epoch;                /*!< epoch */
     char *version;              /*!< version */

diff --git a/src/parsehdr.c b/src/parsehdr.c
index 77bd2db..4932651 100644 (file)
--- a/src/parsehdr.c
+++ b/src/parsehdr.c
@@ -260,7 +260,7 @@ cr_parse_header(Header hdr, gint64 mtime, gint64 size,
                 int pre = 0;
                 const char *filename = rpmtdGetString(filenames);
                 guint64 num_flags = rpmtdGetNumber(fileflags);
-                const char *flags = cr_flag_to_string(num_flags);
+                const char *flags = cr_flag_to_str(num_flags);
                 const char *full_version = rpmtdGetString(fileversions);
 
                 // Requires specific stuff
@@ -307,7 +307,7 @@ cr_parse_header(Header hdr, gint64 mtime, gint64 size,
                 cr_Dependency *dependency = cr_dependency_new();
                 dependency->name = safe_string_chunk_insert(pkg->chunk, filename);
                 dependency->flags = safe_string_chunk_insert(pkg->chunk, flags);
-                struct cr_EVR evr = cr_string_to_version(full_version, pkg->chunk);
+                struct cr_EVR evr = cr_str_to_evr(full_version, pkg->chunk);
                 dependency->epoch = evr.epoch;
                 dependency->version = evr.version;
                 dependency->release = evr.release;

diff --git a/src/repomd.c b/src/repomd.c
index 6bd44ad..a32bcf0 100644 (file)
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -160,7 +160,7 @@ get_compressed_content_stat(const char *filename, cr_ChecksumType checksum_type)
 
 
 int
-cr_fill_missing_data(const char *base_path, cr_RepomdRecord md,
+cr_fill_repomdrecord(const char *base_path, cr_RepomdRecord md,
                      cr_ChecksumType *checksum_type)
 {
     if (!md || !(md->location_href) || !strlen(md->location_href)) {
@@ -254,10 +254,11 @@ cr_fill_missing_data(const char *base_path, cr_RepomdRecord md,
 
 
 void
-cr_process_groupfile(const char *base_path, cr_RepomdRecord groupfile,
-                     cr_RepomdRecord cgroupfile,
-                     cr_ChecksumType *checksum_type,
-                     cr_CompressionType groupfile_compression)
+cr_process_groupfile_repomdrecord(const char *base_path,
+                                  cr_RepomdRecord groupfile,
+                                  cr_RepomdRecord cgroupfile,
+                                  cr_ChecksumType *checksum_type,
+                                  cr_CompressionType groupfile_compression)
 {
     if (!groupfile || !(groupfile->location_href) || !strlen(groupfile->location_href) || !cgroupfile) {
         return;
@@ -474,7 +475,7 @@ repomd_xml_dump(long revision, cr_RepomdRecord pri_xml, cr_RepomdRecord fil_xml,
 
 
 void
-cr_rename_file(const char *base_path, cr_RepomdRecord md)
+cr_rename_repomdrecord_file(const char *base_path, cr_RepomdRecord md)
 {
     if (!md || !(md->location_href) || !strlen(md->location_href)) {
         return;
@@ -533,11 +534,11 @@ cr_rename_file(const char *base_path, cr_RepomdRecord md)
 
 
 gchar *
-cr_xml_repomd(const char *path, cr_RepomdRecord pri_xml,
-              cr_RepomdRecord fil_xml, cr_RepomdRecord oth_xml,
-              cr_RepomdRecord pri_sqlite, cr_RepomdRecord fil_sqlite,
-              cr_RepomdRecord oth_sqlite, cr_RepomdRecord groupfile,
-              cr_RepomdRecord cgroupfile, cr_RepomdRecord update_info)
+cr_generate_repomd_xml(const char *path, cr_RepomdRecord pri_xml,
+                       cr_RepomdRecord fil_xml, cr_RepomdRecord oth_xml,
+                       cr_RepomdRecord pri_sqlite, cr_RepomdRecord fil_sqlite,
+                       cr_RepomdRecord oth_sqlite, cr_RepomdRecord groupfile,
+                       cr_RepomdRecord cgroupfile, cr_RepomdRecord update_info)
 {
     if (!path) {
         return NULL;

diff --git a/src/repomd.h b/src/repomd.h
index 0ad5fbb..4c23d74 100644 (file)
--- a/src/repomd.h
+++ b/src/repomd.h
@@ -30,12 +30,12 @@ extern "C" {
 /** \defgroup repomd            Repomd API.
  */
 
-/** \ingroup misc
+/** \ingroup repomd
  * cr_RepomdRecord object
  */
 typedef struct _cr_RepomdRecord * cr_RepomdRecord;
 
-/** \ingroup misc
+/** \ingroup repomd
  * Internal representation of cr_RepomdRecord object
  */
 struct _cr_RepomdRecord {
@@ -67,32 +67,32 @@ void cr_free_repomdrecord(cr_RepomdRecord record);
 /** \ingroup repomd
  * Fill unfilled items in the cr_RepomdRecord (calculate checksums,
  * get file size before/after compression, etc.).
- * Note: For groupfile you shoud use cr_process_groupfile function.
+ * Note: For groupfile you shoud use cr_process_groupfile_repomdrecord function.
  * @param base_path             path to repo (to directory with repodata subdir)
  * @param record                cr_RepomdRecord object
  * @param checksum_type         type of checksum to use
  */
-int cr_fill_missing_data(const char *base_path,
+int cr_fill_repomdrecord(const char *base_path,
                          cr_RepomdRecord record,
                          cr_ChecksumType *checksum_type);
 
 /** \ingroup repomd
- * Analogue of cr_fill_missing_data but for groupfile.
+ * Analogue of cr_fill_repomdrecord but for groupfile.
  * Groupfile must be set with the path to existing non compressed groupfile.
  * Compressed group file will be created and compressed_groupfile record
  * updated.
  * @param base_path             path to repo (to directory with repodata subdir)
  * @param groupfile             cr_RepomdRecord initialized to an existing
  *                              groupfile
- * @param compressed_groupfile  cr_RepomdRecord object that will by filled
+ * @param compressed_groupfile  empty cr_RepomdRecord object that will by filled
  * @param checksum_type         type of checksums
  * @param compression           type of compression
  */
-void cr_process_groupfile(const char *base_path,
-                          cr_RepomdRecord groupfile,
-                          cr_RepomdRecord compressed_groupfile,
-                          cr_ChecksumType *checksum_type,
-                          cr_CompressionType compression);
+void cr_process_groupfile_repomdrecord(const char *base_path,
+                                       cr_RepomdRecord groupfile,
+                                       cr_RepomdRecord compressed_groupfile,
+                                       cr_ChecksumType *checksum_type,
+                                       cr_CompressionType compression);
 
 /** \ingroup repomd
  * Add a hash as prefix to the filename.
@@ -100,7 +100,7 @@ void cr_process_groupfile(const char *base_path,
  *                              subdir)
  * @param record                cr_RepomdRecord of file to be renamed
  */
-void cr_rename_file(const char *base_path, cr_RepomdRecord record);
+void cr_rename_repomdrecord_file(const char *base_path, cr_RepomdRecord record);
 
 /** \ingroup repomd
  * Generate repomd.xml content.
@@ -126,11 +126,16 @@ void cr_rename_file(const char *base_path, cr_RepomdRecord record);
  *                              towards to the path param)
  * @return                      string with repomd.xml content
  */
-gchar * cr_xml_repomd(const char *path, cr_RepomdRecord pri_xml,
-                      cr_RepomdRecord fil_xml, cr_RepomdRecord oth_xml,
-                      cr_RepomdRecord pri_sqlite, cr_RepomdRecord fil_sqlite,
-                      cr_RepomdRecord oth_sqlite, cr_RepomdRecord groupfile,
-                      cr_RepomdRecord cgroupfile, cr_RepomdRecord update_info);
+gchar *cr_generate_repomd_xml(const char *path,
+                              cr_RepomdRecord pri_xml,
+                              cr_RepomdRecord fil_xml,
+                              cr_RepomdRecord oth_xml,
+                              cr_RepomdRecord pri_sqlite,
+                              cr_RepomdRecord fil_sqlite,
+                              cr_RepomdRecord oth_sqlite,
+                              cr_RepomdRecord groupfile,
+                              cr_RepomdRecord cgroupfile,
+                              cr_RepomdRecord update_info);
 
 #ifdef __cplusplus
 }

diff --git a/src/sqlite.h b/src/sqlite.h
index ca6199d..6c452a6 100644 (file)
--- a/src/sqlite.h
+++ b/src/sqlite.h
@@ -186,7 +186,7 @@ void cr_add_primary_pkg_db(cr_DbPrimaryStatements stmts, cr_Package *pkg);
  * @param stmts                 object with compiled statements
  * @param pkg                   package object
  */
-void cr_add_filelists_pkg_db(cr_DbFilelistsStatements, cr_Package *pkg);
+void cr_add_filelists_pkg_db(cr_DbFilelistsStatements stmts, cr_Package *pkg);
 
 /** \ingroup sqlite
  * Add package into the database.
@@ -197,9 +197,9 @@ void cr_add_other_pkg_db(cr_DbOtherStatements stmts, cr_Package *pkg);
 
 /** \ingroup sqlite
  * Insert record into the updateinfo table
- * @param                       open db connection
- * @checksum                    compressed xml file checksum
- * @err                         **GError
+ * @param db                    open db connection
+ * @param checksum              compressed xml file checksum
+ * @param err                   **GError
  */
 void cr_dbinfo_update(sqlite3 *db, const char *checksum, GError **err);
 

diff --git a/src/version.h b/src/version.h
index c34f406..ad20f5a 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif
 
 /**@{*/
-#define CR_MAJOR_VERSION   0
-#define CR_MINOR_VERSION   1
-#define CR_PATCH_VERSION   6
+#define CR_MAJOR_VERSION   0    /*!< major library version */
+#define CR_MINOR_VERSION   1    /*!< minor library version */
+#define CR_PATCH_VERSION   6    /*!< patch library version */
 /**@}*/
 
 #ifdef __cplusplus

diff --git a/tests/testmisc.c b/tests/testmisc.c
index be175eb..20735f5 100644 (file)
--- a/tests/testmisc.c
+++ b/tests/testmisc.c
@@ -46,13 +46,13 @@
 #define INVALID_URL     "htp://foo.bar"
 
 
-static void test_cr_string_to_version(void)
+static void test_cr_str_to_evr(void)
 {
     struct cr_EVR evr;
 
     // V
 
-    evr = cr_string_to_version("5.0.0", NULL);
+    evr = cr_str_to_evr("5.0.0", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -60,7 +60,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("6.1", NULL);
+    evr = cr_str_to_evr("6.1", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -68,7 +68,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("7", NULL);
+    evr = cr_str_to_evr("7", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -78,7 +78,7 @@ static void test_cr_string_to_version(void)
 
     // VR
 
-    evr = cr_string_to_version("5.0.0-2", NULL);
+    evr = cr_str_to_evr("5.0.0-2", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, "2");
@@ -86,7 +86,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("6.1-3", NULL);
+    evr = cr_str_to_evr("6.1-3", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, "3");
@@ -94,7 +94,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("7-4", NULL);
+    evr = cr_str_to_evr("7-4", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, "4");
@@ -104,7 +104,7 @@ static void test_cr_string_to_version(void)
 
     // EV
 
-    evr = cr_string_to_version("1:5.0.0", NULL);
+    evr = cr_str_to_evr("1:5.0.0", NULL);
     g_assert_cmpstr(evr.epoch, ==, "1");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -112,7 +112,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("2:6.1", NULL);
+    evr = cr_str_to_evr("2:6.1", NULL);
     g_assert_cmpstr(evr.epoch, ==, "2");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -120,7 +120,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("3:7", NULL);
+    evr = cr_str_to_evr("3:7", NULL);
     g_assert_cmpstr(evr.epoch, ==, "3");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -130,7 +130,7 @@ static void test_cr_string_to_version(void)
 
     //cr_EVR
 
-    evr = cr_string_to_version("1:5.0.0-11", NULL);
+    evr = cr_str_to_evr("1:5.0.0-11", NULL);
     g_assert_cmpstr(evr.epoch, ==, "1");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, "11");
@@ -138,7 +138,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("2:6.1-22", NULL);
+    evr = cr_str_to_evr("2:6.1-22", NULL);
     g_assert_cmpstr(evr.epoch, ==, "2");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, "22");
@@ -146,7 +146,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("3:7-33", NULL);
+    evr = cr_str_to_evr("3:7-33", NULL);
     g_assert_cmpstr(evr.epoch, ==, "3");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, "33");
@@ -156,7 +156,7 @@ static void test_cr_string_to_version(void)
 
     // Bad strings
 
-    evr = cr_string_to_version(":", NULL);
+    evr = cr_str_to_evr(":", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -164,7 +164,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version(":-", NULL);
+    evr = cr_str_to_evr(":-", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -174,7 +174,7 @@ static void test_cr_string_to_version(void)
 
     // Really bad values
 
-    evr = cr_string_to_version(NULL, NULL);
+    evr = cr_str_to_evr(NULL, NULL);
     g_assert_cmpstr(evr.epoch, ==, NULL);
     g_assert_cmpstr(evr.version, ==, NULL);
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -182,7 +182,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("", NULL);
+    evr = cr_str_to_evr("", NULL);
     g_assert_cmpstr(evr.epoch, ==, NULL);
     g_assert_cmpstr(evr.version, ==, NULL);
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -190,7 +190,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("-", NULL);
+    evr = cr_str_to_evr("-", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -198,7 +198,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("-:", NULL);
+    evr = cr_str_to_evr("-:", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -206,7 +206,7 @@ static void test_cr_string_to_version(void)
     free(evr.version);
     free(evr.release);
 
-    evr = cr_string_to_version("foo:bar", NULL);
+    evr = cr_str_to_evr("foo:bar", NULL);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "bar");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -216,7 +216,7 @@ static void test_cr_string_to_version(void)
 }
 
 
-static void test_cr_string_to_version_with_chunk(void)
+static void test_cr_str_to_evr_with_chunk(void)
 {
     struct cr_EVR evr;
     GStringChunk *chunk;
@@ -224,107 +224,107 @@ static void test_cr_string_to_version_with_chunk(void)
 
     // V
 
-    evr = cr_string_to_version("5.0.0", chunk);
+    evr = cr_str_to_evr("5.0.0", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("6.1", chunk);
+    evr = cr_str_to_evr("6.1", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("7", chunk);
+    evr = cr_str_to_evr("7", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, NULL);
 
     // VR
 
-    evr = cr_string_to_version("5.0.0-2", chunk);
+    evr = cr_str_to_evr("5.0.0-2", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, "2");
 
-    evr = cr_string_to_version("6.1-3", chunk);
+    evr = cr_str_to_evr("6.1-3", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, "3");
 
-    evr = cr_string_to_version("7-4", chunk);
+    evr = cr_str_to_evr("7-4", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, "4");
 
     // EV
 
-    evr = cr_string_to_version("1:5.0.0", chunk);
+    evr = cr_str_to_evr("1:5.0.0", chunk);
     g_assert_cmpstr(evr.epoch, ==, "1");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("2:6.1", chunk);
+    evr = cr_str_to_evr("2:6.1", chunk);
     g_assert_cmpstr(evr.epoch, ==, "2");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("3:7", chunk);
+    evr = cr_str_to_evr("3:7", chunk);
     g_assert_cmpstr(evr.epoch, ==, "3");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, NULL);
 
     //cr_EVR
 
-    evr = cr_string_to_version("1:5.0.0-11", chunk);
+    evr = cr_str_to_evr("1:5.0.0-11", chunk);
     g_assert_cmpstr(evr.epoch, ==, "1");
     g_assert_cmpstr(evr.version, ==, "5.0.0");
     g_assert_cmpstr(evr.release, ==, "11");
 
-    evr = cr_string_to_version("2:6.1-22", chunk);
+    evr = cr_str_to_evr("2:6.1-22", chunk);
     g_assert_cmpstr(evr.epoch, ==, "2");
     g_assert_cmpstr(evr.version, ==, "6.1");
     g_assert_cmpstr(evr.release, ==, "22");
 
-    evr = cr_string_to_version("3:7-33", chunk);
+    evr = cr_str_to_evr("3:7-33", chunk);
     g_assert_cmpstr(evr.epoch, ==, "3");
     g_assert_cmpstr(evr.version, ==, "7");
     g_assert_cmpstr(evr.release, ==, "33");
 
     // Bad strings
 
-    evr = cr_string_to_version(":", chunk);
+    evr = cr_str_to_evr(":", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version(":-", chunk);
+    evr = cr_str_to_evr(":-", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
 
     // Really bad values
 
-    evr = cr_string_to_version(NULL, chunk);
+    evr = cr_str_to_evr(NULL, chunk);
     g_assert_cmpstr(evr.epoch, ==, NULL);
     g_assert_cmpstr(evr.version, ==, NULL);
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("", chunk);
+    evr = cr_str_to_evr("", chunk);
     g_assert_cmpstr(evr.epoch, ==, NULL);
     g_assert_cmpstr(evr.version, ==, NULL);
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("-", chunk);
+    evr = cr_str_to_evr("-", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("-:", chunk);
+    evr = cr_str_to_evr("-:", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "");
     g_assert_cmpstr(evr.release, ==, NULL);
 
-    evr = cr_string_to_version("foo:bar", chunk);
+    evr = cr_str_to_evr("foo:bar", chunk);
     g_assert_cmpstr(evr.epoch, ==, "0");
     g_assert_cmpstr(evr.version, ==, "bar");
     g_assert_cmpstr(evr.release, ==, NULL);
@@ -887,56 +887,56 @@ static void test_cr_str_to_version(void)
 }
 
 
-static void test_cr_cmp_version_string(void)
+static void test_cr_cmp_version_str(void)
 {
     int ret;
 
-    ret = cr_cmp_version_string(NULL, NULL);
+    ret = cr_cmp_version_str(NULL, NULL);
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("", "");
+    ret = cr_cmp_version_str("", "");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string(NULL, "");
+    ret = cr_cmp_version_str(NULL, "");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("", NULL);
+    ret = cr_cmp_version_str("", NULL);
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("3", "3");
+    ret = cr_cmp_version_str("3", "3");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("1", "2");
+    ret = cr_cmp_version_str("1", "2");
     g_assert_cmpint(ret, ==, 2);
 
-    ret = cr_cmp_version_string("99", "8");
+    ret = cr_cmp_version_str("99", "8");
     g_assert_cmpint(ret, ==, 1);
 
-    ret = cr_cmp_version_string("5.4.3", "5.4.3");
+    ret = cr_cmp_version_str("5.4.3", "5.4.3");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("5.3.2", "5.3.1");
+    ret = cr_cmp_version_str("5.3.2", "5.3.1");
     g_assert_cmpint(ret, ==, 1);
 
-    ret = cr_cmp_version_string("5.3.5", "5.3.6");
+    ret = cr_cmp_version_str("5.3.5", "5.3.6");
     g_assert_cmpint(ret, ==, 2);
 
-    ret = cr_cmp_version_string("6.3.2a", "6.3.2b");
+    ret = cr_cmp_version_str("6.3.2a", "6.3.2b");
     g_assert_cmpint(ret, ==, 2);
 
-    ret = cr_cmp_version_string("6.3.2azb", "6.3.2abc");
+    ret = cr_cmp_version_str("6.3.2azb", "6.3.2abc");
     g_assert_cmpint(ret, ==, 1);
 
-    ret = cr_cmp_version_string("1.2beta", "1.2beta");
+    ret = cr_cmp_version_str("1.2beta", "1.2beta");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("n", "n");
+    ret = cr_cmp_version_str("n", "n");
     g_assert_cmpint(ret, ==, 0);
 
-    ret = cr_cmp_version_string("c", "b");
+    ret = cr_cmp_version_str("c", "b");
     g_assert_cmpint(ret, ==,  1);
 
-    ret = cr_cmp_version_string("c", "f");
+    ret = cr_cmp_version_str("c", "f");
     g_assert_cmpint(ret, ==, 2);
 }
 
@@ -946,8 +946,8 @@ int main(int argc, char *argv[])
 {
     g_test_init(&argc, &argv, NULL);
 
-    g_test_add_func("/misc/test_cr_string_to_version", test_cr_string_to_version);
-    g_test_add_func("/misc/test_cr_string_to_version_with_chunk", test_cr_string_to_version_with_chunk);
+    g_test_add_func("/misc/test_cr_str_to_evr", test_cr_str_to_evr);
+    g_test_add_func("/misc/test_cr_str_to_evr_with_chunk", test_cr_str_to_evr_with_chunk);
     g_test_add_func("/misc/test_cr_is_primary", test_cr_is_primary);
     g_test_add_func("/misc/test_cr_compute_file_checksum", test_cr_compute_file_checksum);
     g_test_add_func("/misc/test_cr_get_header_byte_range", test_cr_get_header_byte_range);
@@ -967,7 +967,7 @@ int main(int argc, char *argv[])
     g_test_add_func("/misc/test_cr_normalize_dir_path", test_cr_normalize_dir_path);
     g_test_add_func("/misc/test_cr_remove_dir", test_cr_remove_dir);
     g_test_add_func("/misc/test_cr_str_to_version", test_cr_str_to_version);
-    g_test_add_func("/misc/test_cr_cmp_version_string", test_cr_cmp_version_string);
+    g_test_add_func("/misc/test_cr_cmp_version_str", test_cr_cmp_version_str);
 
     return g_test_run();
 }

diff --git a/utils/get_version.py b/utils/get_version.py
index cc04140..060c4b4 100755 (executable)
--- a/utils/get_version.py
+++ b/utils/get_version.py
@@ -16,9 +16,9 @@ def parse(root_dir):
 
     content = open(path, "r").read()
     ver = {}
-    ver['major'] = re.search('#define\s+CR_MAJOR_VERSION\s+(\d)', content).group(1)
-    ver['minor'] = re.search('#define\s+CR_MINOR_VERSION\s+(\d)', content).group(1)
-    ver['patch'] = re.search('#define\s+CR_PATCH_VERSION\s+(\d)', content).group(1)
+    ver['major'] = re.search('#define\s+CR_MAJOR_VERSION\s+(\d).*', content).group(1)
+    ver['minor'] = re.search('#define\s+CR_MINOR_VERSION\s+(\d).*', content).group(1)
+    ver['patch'] = re.search('#define\s+CR_PATCH_VERSION\s+(\d).*', content).group(1)
     return ver