Fix build issues on 64bit architectures

Change-Id: I6b4522461092dba899e12f20551db8b78efd6508
Signed-off-by: Konrad Kuchciak <k.kuchciak@samsung.com>

diff --git a/src/library/diagnostics.c b/src/library/diagnostics.c
index 55501fe..4d781aa 100644 (file)
--- a/src/library/diagnostics.c
+++ b/src/library/diagnostics.c
@@ -276,7 +276,7 @@ int diagnostics_get_client_id(diagnostics_ctx_h ctx, char **client_id)
     return DIAGNOSTICS_ERROR_NONE;
 }
 
-STATIC int get_report_path(diagnostics_ctx_h ctx, const char **path, unsigned int *len)
+STATIC int get_report_path(diagnostics_ctx_h ctx, const char **path, size_t *len)
 {
     RETV_IF(ctx == NULL, DIAGNOSTICS_ERROR_INVALID_PARAMETER);
     RETV_IF(path == NULL, DIAGNOSTICS_ERROR_INVALID_PARAMETER);
@@ -285,7 +285,7 @@ STATIC int get_report_path(diagnostics_ctx_h ctx, const char **path, unsigned in
     GVariant *val;
 
     val = g_variant_get_child_value(((struct _diagnostics_ctx_s *)ctx)->signal->parameters, SIG_CRASH_REPORTPATH);
-    *path = g_variant_get_string(val, len);
+    *path = g_variant_get_string(val, (gsize *)len);
 
     return DIAGNOSTICS_ERROR_NONE;
 }
@@ -299,7 +299,7 @@ int diagnostics_get_data(diagnostics_ctx_h ctx, const char **params, int params_
     RETV_IF(((struct _diagnostics_ctx_s *)ctx)->signal_type != SIG_TYPE_CRASH, DIAGNOSTICS_ERROR_NOT_SUPPORTED);
 
     const char *report_path;
-    unsigned int len;
+    size_t len;
     int report_id;
     int fd;
     int ret;

diff --git a/src/test/test_diagnostics_add_function_defs.h b/src/test/test_diagnostics_add_function_defs.h
index e4a65b2..82f6890 100644 (file)
--- a/src/test/test_diagnostics_add_function_defs.h
+++ b/src/test/test_diagnostics_add_function_defs.h
@@ -29,7 +29,7 @@ extern "C" {
 
 extern struct _diagnostics_cb_info_s cb_info;
 
-int get_report_path(void *ctx, const char **path, unsigned int *len);
+int get_report_path(diagnostics_ctx_h ctx, const char **path, size_t *len);
 struct _diagnostics_ctx_s *diagnostics_create(struct dbus_signal_s *signal);
 struct _diagnostics_data_s *diagnostics_data_create(int fd);
 void signal_handler(GDBusConnection *connection,

diff --git a/src/test/test_diagnostics_data_read.c b/src/test/test_diagnostics_data_read.c
index 1562817..5cb5e9e 100644 (file)
--- a/src/test/test_diagnostics_data_read.c
+++ b/src/test/test_diagnostics_data_read.c
@@ -101,7 +101,7 @@ static void test_diagnostics_data_read_n6(void **state) {
        assert_int_equal(diagnostics_data_read(&data, buf, count, timeout, &bytes_read), DIAGNOSTICS_ERROR_IO_ERROR);
 }
 
-int read(int fd, void *buf, size_t nbytes)
+ssize_t read(int fd, void *buf, size_t nbytes)
 {
        (void) fd;
        (void) buf;

diff --git a/src/test/test_diagnostics_get_report_path.c b/src/test/test_diagnostics_get_report_path.c
index fad3f53..7baa12c 100644 (file)
--- a/src/test/test_diagnostics_get_report_path.c
+++ b/src/test/test_diagnostics_get_report_path.c
@@ -34,7 +34,7 @@
 static void test_diagnostics_get_report_path_n1(void **state) {
        (void) state;
        const char *path;
-       unsigned int len;
+       size_t len;
 
        assert_int_equal(get_report_path(NULL, &path, &len), DIAGNOSTICS_ERROR_INVALID_PARAMETER);
 }
@@ -42,7 +42,7 @@ static void test_diagnostics_get_report_path_n1(void **state) {
 static void test_diagnostics_get_report_path_n2(void **state) {
        (void) state;
        diagnostics_ctx_h br_ptr = build_ctx_crash();
-       unsigned int len;
+       size_t len;
 
        assert_int_equal(get_report_path(br_ptr, NULL, &len), DIAGNOSTICS_ERROR_INVALID_PARAMETER);
 
@@ -54,7 +54,7 @@ static void test_diagnostics_get_report_path_n3(void **state) {
        diagnostics_ctx_h ctx = build_ctx_crash();
        ((struct _diagnostics_ctx_s *)ctx)->signal_type = SIG_TYPE_CRASH + 10;
        const char *path;
-       unsigned int len;
+       size_t len;
 
        assert_int_equal(get_report_path(ctx, &path, &len), DIAGNOSTICS_ERROR_NOT_SUPPORTED);
 
@@ -65,7 +65,7 @@ static void test_diagnostics_get_report_path_p1(void **state) {
        (void) state;
        diagnostics_ctx_h ctx = build_ctx_crash();
        const char *path;
-       unsigned int len;
+       size_t len;
        int result = get_report_path(ctx, &path, &len);
 
        assert_int_equal(result, DIAGNOSTICS_ERROR_NONE);