Refactoring: Better handling of gint64 type

diff --git a/src/cmd_parser.c b/src/cmd_parser.c
index 4fc14d2185190bc0f8c2f1845c156462fab60091..f782d93644a8a0f016c4eb0bae57a92e3eaaec53 100644 (file)
--- a/src/cmd_parser.c
+++ b/src/cmd_parser.c
@@ -46,7 +46,7 @@ struct CmdOptions _cmd_options = {
         .retain_old           = 0,
         .compression_type     = CR_CW_UNKNOWN_COMPRESSION,
         .ignore_lock          = DEFAULT_IGNORE_LOCK,
-        .md_max_age           = 0,
+        .md_max_age           = G_GINT64_CONSTANT(0),
         .cachedir             = NULL,
         .local_sqlite         = DEFAULT_LOCAL_SQLITE,
         .cut_dirs             = 0,
@@ -237,7 +237,7 @@ parse_period_of_time(const gchar *timeperiod, gint64 *time, GError **err)
     gchar *endptr = NULL;
     gint64 val = g_ascii_strtoll(timeperiod, &endptr, 0);
 
-    *time = 0;
+    *time = G_GINT64_CONSTANT(0);
 
     // Check the state of the conversion
     if (val == 0 && endptr == timeperiod) {
@@ -259,13 +259,13 @@ parse_period_of_time(const gchar *timeperiod, gint64 *time, GError **err)
     }
 
     if (!endptr || endptr[0] == '\0') // Secs
-        *time = val;
+        *time = (gint64) val;
     else if (!strcmp(endptr, "m"))    // Minutes
-        *time = val*60;
+        *time = (gint64) val*60;
     else if (!strcmp(endptr, "h"))    // Hours
-        *time = val*60*60;
+        *time = (gint64) val*60*60;
     else if (!strcmp(endptr, "d"))    // Days
-        *time = val*24*60*60;
+        *time = (gint64) val*24*60*60;
     else {
         g_set_error(err, ERR_DOMAIN, CRE_BADARG,
                     "Bad time unit \"%s\"", endptr);

diff --git a/src/deltarpms.c b/src/deltarpms.c
index cb7997fe0393e4bf9cde497cf664d6e6fbfa39ba..4f518ffb8a31dc4f4690b6c401252b25f07c348b 100644 (file)
--- a/src/deltarpms.c
+++ b/src/deltarpms.c
@@ -431,7 +431,7 @@ cr_deltarpms_parallel_deltas(GSList *targetpackages,
     user_data.num_deltas            = num_deltas;
     user_data.oldpackages           = oldpackages;
     user_data.mutex                 = g_mutex_new();
-    user_data.active_work_size      = 0;
+    user_data.active_work_size      = G_GINT64_CONSTANT(0);
     user_data.active_tasks          = 0;
     user_data.cond_task_finished    = g_cond_new();
 

diff --git a/src/parsehdr.c b/src/parsehdr.c
index c991b3bffe03e6231cfc9b8ca7d3c377d59022a4..670b9b9f134cbdc8df203ba785fce1383e734e07 100644 (file)
--- a/src/parsehdr.c
+++ b/src/parsehdr.c
@@ -490,7 +490,7 @@ cr_package_from_header(Header hdr,
         headerGet(hdr, RPMTAG_CHANGELOGNAME, changelognames, flags) &&
         headerGet(hdr, RPMTAG_CHANGELOGTEXT, changelogtexts, flags))
     {
-        gint64 last_time = 0;
+        gint64 last_time = G_GINT64_CONSTANT(0);
         rpmtdInit(changelogtimes);
         rpmtdInit(changelognames);
         rpmtdInit(changelogtexts);

diff --git a/src/python/contentstat-py.c b/src/python/contentstat-py.c
index d0301ae1797640ae80bf603ce7cd01b90574220c..c28bd04765449096e563c1ba4ae9dd78ac33a922 100644 (file)
--- a/src/python/contentstat-py.c
+++ b/src/python/contentstat-py.c
@@ -119,7 +119,7 @@ get_num(_ContentStatObject *self, void *member_offset)
     if (check_ContentStatStatus(self))
         return NULL;
     cr_ContentStat *rec = self->stat;
-    gint64 val = *((gint64 *) ((size_t)rec + (size_t) member_offset));
+    gint64 val = (gint64) *((gint64 *) ((size_t)rec + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 
@@ -129,7 +129,7 @@ get_int(_ContentStatObject *self, void *member_offset)
     if (check_ContentStatStatus(self))
         return NULL;
     cr_ContentStat *rec = self->stat;
-    gint64 val = *((int *) ((size_t)rec + (size_t) member_offset));
+    gint64 val = (gint64) *((int *) ((size_t)rec + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 

diff --git a/src/python/package-py.c b/src/python/package-py.c
index e31c77d8ca85c28108159cbdba64be830c736890..1b58d2d42473878a6a34f5e983d7a4aed1b83cb3 100644 (file)
--- a/src/python/package-py.c
+++ b/src/python/package-py.c
@@ -248,7 +248,7 @@ get_num(_PackageObject *self, void *member_offset)
     if (check_PackageStatus(self))
         return NULL;
     cr_Package *pkg = self->package;
-    gint64 val = *((gint64 *) ((size_t)pkg + (size_t) member_offset));
+    gint64 val = (gint64) *((gint64 *) ((size_t)pkg + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 

diff --git a/src/python/repomdrecord-py.c b/src/python/repomdrecord-py.c
index a85ca9f1e6ce56c4f8baa43269a6180f3ad6920a..7cb648b1e9cd104917347000b80503c97c5a68a2 100644 (file)
--- a/src/python/repomdrecord-py.c
+++ b/src/python/repomdrecord-py.c
@@ -273,7 +273,7 @@ get_num(_RepomdRecordObject *self, void *member_offset)
     if (check_RepomdRecordStatus(self))
         return NULL;
     cr_RepomdRecord *rec = self->record;
-    gint64 val = *((gint64 *) ((size_t)rec + (size_t) member_offset));
+    gint64 val = (gint64) *((gint64 *) ((size_t)rec + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 
@@ -283,7 +283,7 @@ get_int(_RepomdRecordObject *self, void *member_offset)
     if (check_RepomdRecordStatus(self))
         return NULL;
     cr_RepomdRecord *rec = self->record;
-    gint64 val = *((int *) ((size_t)rec + (size_t) member_offset));
+    gint64 val = (gint64) *((int *) ((size_t)rec + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 

diff --git a/src/repomd.c b/src/repomd.c
index 89495df195a0719467d5fc62e8089f2d30cc6887..fea2c7ed83d3e42869067e306c64fcc7851288aa 100644 (file)
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -55,7 +55,7 @@ cr_repomd_record_new(const char *type, const char *path)
     cr_RepomdRecord *md = g_malloc0(sizeof(*md));
     md->chunk = g_string_chunk_new(128);
     md->type  = cr_safe_string_chunk_insert(md->chunk, type);
-    md->size_open = -1;
+    md->size_open = G_GINT64_CONSTANT(-1);
 
     if (path) {
         gchar *filename = cr_get_filename(path);
@@ -148,7 +148,7 @@ cr_get_compressed_content_stat(const char *filename,
         return NULL;
     }
 
-    gint64 size = 0;
+    gint64 size = G_GINT64_CONSTANT(0);
     long readed;
     unsigned char buffer[BUFFER_SIZE];
 
@@ -239,7 +239,7 @@ cr_repomd_record_fill(cr_RepomdRecord *md,
 
     // Compute checksum of non compressed content and its size
 
-    if (!md->checksum_open_type || !md->checksum_open || md->size_open == -1) {
+    if (!md->checksum_open_type || !md->checksum_open || md->size_open == G_GINT64_CONSTANT(-1)) {
         cr_CompressionType com_type = cr_detect_compression(path, &tmp_err);
         if (tmp_err) {
             int code = tmp_err->code;
@@ -265,7 +265,7 @@ cr_repomd_record_fill(cr_RepomdRecord *md,
 
             md->checksum_open_type = g_string_chunk_insert(md->chunk, checksum_str);
             md->checksum_open = g_string_chunk_insert(md->chunk, open_stat->checksum);
-            if (md->size_open == -1)
+            if (md->size_open == G_GINT64_CONSTANT(-1))
                 md->size_open = open_stat->size;
             g_free(open_stat->checksum);
             g_free(open_stat);
@@ -277,7 +277,7 @@ cr_repomd_record_fill(cr_RepomdRecord *md,
             }
             md->checksum_open_type = NULL;
             md->checksum_open = NULL;
-            md->size_open = -1;
+            md->size_open = G_GINT64_CONSTANT(-1);
         }
     }
 
@@ -327,8 +327,8 @@ cr_repomd_record_compress_and_fill(cr_RepomdRecord *record,
     char buf[BUFFER_SIZE];
     CR_FILE *cw_plain;
     CR_FILE *cw_compressed;
-    gint64 gf_size = -1, cgf_size = -1;
-    gint64 gf_time = -1, cgf_time = -1;
+    gint64 gf_size = G_GINT64_CONSTANT(-1), cgf_size = G_GINT64_CONSTANT(-1);
+    gint64 gf_time = G_GINT64_CONSTANT(-1), cgf_time = G_GINT64_CONSTANT(-1);
     struct stat gf_stat, cgf_stat;
     const char *checksum_str = cr_checksum_name_str(checksum_type);
     GError *tmp_err = NULL;
@@ -469,7 +469,7 @@ cr_repomd_record_compress_and_fill(cr_RepomdRecord *record,
     record->checksum_open_type = NULL;
     record->timestamp = gf_time;
     record->size = gf_size;
-    record->size_open = -1;
+    record->size_open = G_GINT64_CONSTANT(-1);
 
     crecord->checksum = g_string_chunk_insert(crecord->chunk, cchecksum);
     crecord->checksum_type = g_string_chunk_insert(crecord->chunk, checksum_str);