Repomd: RepomdRecord timestamp, size and size_open switched to gint64 from long.

diff --git a/src/python/package-py.c b/src/python/package-py.c
index c641bbc..6e4afaa 100644 (file)
--- a/src/python/package-py.c
+++ b/src/python/package-py.c
@@ -314,19 +314,19 @@ get_list(_PackageObject *self, void *conv)
 static int
 set_num(_PackageObject *self, PyObject *value, void *member_offset)
 {
-    long val;
+    gint64 val;
     if (check_PackageStatus(self))
         return -1;
     if (PyLong_Check(value)) {
-        val = PyLong_AsLong(value);
+        val = (gint64) PyLong_AsLong(value);
     } else if (PyInt_Check(value)) {
-        val = PyInt_AS_LONG(value);
+        val = (gint64) PyInt_AS_LONG(value);
     } else {
         PyErr_SetString(PyExc_ValueError, "Number expected!");
         return -1;
     }
     cr_Package *pkg = self->package;
-    *((long *) ((size_t) pkg + (size_t) member_offset)) = val;
+    *((gint64 *) ((size_t) pkg + (size_t) member_offset)) = val;
     return 0;
 }
 

diff --git a/src/python/repomdrecord-py.c b/src/python/repomdrecord-py.c
index 8c0ed6d..2938c5c 100644 (file)
--- a/src/python/repomdrecord-py.c
+++ b/src/python/repomdrecord-py.c
@@ -220,12 +220,12 @@ static struct PyMethodDef repomdrecord_methods[] = {
 #define OFFSET(member) (void *) offsetof(cr_RepomdRecord, member)
 
 static PyObject *
-get_long(_RepomdRecordObject *self, void *member_offset)
+get_num(_RepomdRecordObject *self, void *member_offset)
 {
     if (check_RepomdRecordStatus(self))
         return NULL;
     cr_RepomdRecord *rec = self->record;
-    gint64 val = *((long *) ((size_t)rec + (size_t) member_offset));
+    gint64 val = *((gint64 *) ((size_t)rec + (size_t) member_offset));
     return PyLong_FromLongLong((long long) val);
 }
 
@@ -252,21 +252,21 @@ get_str(_RepomdRecordObject *self, void *member_offset)
 }
 
 static int
-set_long(_RepomdRecordObject *self, PyObject *value, void *member_offset)
+set_num(_RepomdRecordObject *self, PyObject *value, void *member_offset)
 {
-    long val;
+    gint64 val;
     if (check_RepomdRecordStatus(self))
         return -1;
     if (PyLong_Check(value)) {
-        val = PyLong_AsLong(value);
+        val = (gint64) PyLong_AsLong(value);
     } else if (PyInt_Check(value)) {
-        val = PyInt_AS_LONG(value);
+        val = (gint64) PyInt_AS_LONG(value);
     } else {
         PyErr_SetString(PyExc_ValueError, "Number expected!");
         return -1;
     }
     cr_RepomdRecord *rec = self->record;
-    *((long *) ((size_t) rec + (size_t) member_offset)) = val;
+    *((gint64 *) ((size_t) rec + (size_t) member_offset)) = val;
     return 0;
 }
 
@@ -313,9 +313,9 @@ static PyGetSetDef repomdrecord_getsetters[] = {
     {"checksum_type",       (getter)get_str, (setter)set_str, NULL, OFFSET(checksum_type)},
     {"checksum_open",       (getter)get_str, (setter)set_str, NULL, OFFSET(checksum_open)},
     {"checksum_open_type",  (getter)get_str, (setter)set_str, NULL, OFFSET(checksum_open_type)},
-    {"timestamp",           (getter)get_long, (setter)set_long, NULL, OFFSET(timestamp)},
-    {"size",                (getter)get_long, (setter)set_long, NULL, OFFSET(size)},
-    {"size_open",           (getter)get_long, (setter)set_long, NULL, OFFSET(size_open)},
+    {"timestamp",           (getter)get_num, (setter)set_num, NULL, OFFSET(timestamp)},
+    {"size",                (getter)get_num, (setter)set_num, NULL, OFFSET(size)},
+    {"size_open",           (getter)get_num, (setter)set_num, NULL, OFFSET(size_open)},
     {"db_ver",              (getter)get_int, (setter)set_int, NULL, OFFSET(db_ver)},
     {NULL, NULL, NULL, NULL, NULL} /* sentinel */
 };

diff --git a/src/repomd.c b/src/repomd.c
index 3342b40..98802d2 100644 (file)
--- a/src/repomd.c
+++ b/src/repomd.c
@@ -34,13 +34,13 @@
 #include "repomd_internal.h"
 #include "compression_wrapper.h"
 
-#define LOCATION_HREF_PREFIX            "repodata/"
-#define DEFAULT_DATABASE_VERSION        10
-#define BUFFER_SIZE          8192
+#define LOCATION_HREF_PREFIX        "repodata/"
+#define DEFAULT_DATABASE_VERSION    10
+#define BUFFER_SIZE                 8192
 
 typedef struct _contentStat {
     char *checksum;
-    long size;
+    gint64 size;
 } contentStat;
 
 cr_DistroTag *
@@ -145,7 +145,7 @@ cr_get_compressed_content_stat(const char *filename,
         return NULL;
     }
 
-    long size = 0;
+    gint64 size = 0;
     long readed;
     unsigned char buffer[BUFFER_SIZE];
 
@@ -322,8 +322,8 @@ cr_repomd_record_compress_and_fill(cr_RepomdRecord *record,
     char buf[BUFFER_SIZE];
     CR_FILE *cw_plain;
     CR_FILE *cw_compressed;
-    long gf_size = -1, cgf_size = -1;
-    long gf_time = -1, cgf_time = -1;
+    gint64 gf_size = -1, cgf_size = -1;
+    gint64 gf_time = -1, cgf_time = -1;
     struct stat gf_stat, cgf_stat;
     const char *checksum_str = cr_checksum_name_str(checksum_type);
     GError *tmp_err = NULL;

diff --git a/src/repomd.h b/src/repomd.h
index 3d45851..1767315 100644 (file)
--- a/src/repomd.h
+++ b/src/repomd.h
@@ -79,9 +79,9 @@ typedef struct {
     char *checksum_type;        /*!< checksum type */
     char *checksum_open;        /*!< checksum of uncompressed file */
     char *checksum_open_type;   /*!< checksum type of uncompressed file*/
-    long timestamp;             /*!< mtime of the file */
-    long size;                  /*!< size of file in bytes */
-    long size_open;             /*!< size of uncompressed file in bytes */
+    gint64 timestamp;           /*!< mtime of the file */
+    gint64 size;                /*!< size of file in bytes */
+    gint64 size_open;           /*!< size of uncompressed file in bytes */
     int db_ver;                 /*!< version of database */
 
     GStringChunk *chunk;        /*!< String chunk */