Fix gint formatting

Author: bynect

src/dunst.c

@@ -164,7 +164,7 @@ static gboolean run(void *data)
                 gint64 sleep = timeout_at - now;
                 sleep = MAX(sleep, 1000); // Sleep at least 1ms
 
-                LOG_D("Sleeping for %li ms", sleep/1000);
+                LOG_D("Sleeping for %"G_GINT64_FORMAT" ms", sleep/1000);
 
                 next_timeout_id = g_timeout_add(sleep/1000, run, NULL);
         }

src/notification.c

@@ -61,9 +61,9 @@ void notification_print(const struct notification *n)
         printf("\ticon_id: '%s'\n", STR_NN(n->icon_id));
         printf("\tdesktop_entry: '%s'\n", n->desktop_entry ? n->desktop_entry : "");
         printf("\tcategory: %s\n", STR_NN(n->category));
-        printf("\ttimeout: %ld\n", n->timeout/1000);
-        printf("\tstart: %ld\n", n->start);
-        printf("\ttimestamp: %ld\n", n->timestamp);
+        printf("\ttimeout: %"G_GINT64_FORMAT"\n", n->timeout/1000);
+        printf("\tstart: %"G_GINT64_FORMAT"\n", n->start);
+        printf("\ttimestamp: %"G_GINT64_FORMAT"\n", n->timestamp);
         printf("\turgency: %s\n", notification_urgency_to_string(n->urgency));
         printf("\ttransient: %d\n", n->transient);
         printf("\tformatted: '%s'\n", STR_NN(n->msg));
@@ -148,8 +148,8 @@ void notification_run_script(struct notification *n)
                                 // Set environment variables
                                 gchar *n_id_str = g_strdup_printf("%i", n->id);
                                 gchar *n_progress_str = g_strdup_printf("%i", n->progress);
-                                gchar *n_timeout_str = g_strdup_printf("%li", n->timeout/1000);
-                                gchar *n_timestamp_str = g_strdup_printf("%li", n->timestamp / 1000);
+                                gchar *n_timeout_str = g_strdup_printf("%"G_GINT64_FORMAT, n->timeout/1000);
+                                gchar *n_timestamp_str = g_strdup_printf("%"G_GINT64_FORMAT, n->timestamp / 1000);
                                 safe_setenv("DUNST_APP_NAME",  appname);
                                 safe_setenv("DUNST_SUMMARY",   summary);
                                 safe_setenv("DUNST_BODY",      body);
@@ -725,15 +725,14 @@ void notification_update_text_to_render(struct notification *n)
 
                 char *new_buf;
                 if (hours > 0) {
-                        new_buf =
-                            g_strdup_printf("%s (%ldh %ldm %lds old)", buf, hours,
-                                            minutes, seconds);
+                        new_buf = g_strdup_printf("%s (%"G_GINT64_FORMAT"h %"G_GINT64_FORMAT"m %"G_GINT64_FORMAT"s old)",
+                                                  buf, hours, minutes, seconds);
                 } else if (minutes > 0) {
-                        new_buf =
-                            g_strdup_printf("%s (%ldm %lds old)", buf, minutes,
-                                            seconds);
+                        new_buf = g_strdup_printf("%s (%"G_GINT64_FORMAT"m %"G_GINT64_FORMAT"s old)",
+                                                  buf, minutes, seconds);
                 } else {
-                        new_buf = g_strdup_printf("%s (%lds old)", buf, seconds);
+                        new_buf = g_strdup_printf("%s (%"G_GINT64_FORMAT"s old)",
+                                                  buf, seconds);
                 }
 
                 g_free(buf);

src/notification.h

@@ -47,7 +47,7 @@ struct notification_colors {
 
 struct notification {
         NotificationPrivate *priv;
-        int id;
+        gint id;
         char *dbus_client;
         bool dbus_valid;
 

src/rules.c

@@ -150,12 +150,12 @@ void rule_print(const struct rule *r)
         if (r->msg_urgency != URG_NONE) printf("\tmsg_urgency: '%s'\n", notification_urgency_to_string(r->msg_urgency));
         if (r->stack_tag != NULL) printf("\tstack_tag: '%s'\n", r->stack_tag);
         if (r->desktop_entry != NULL) printf("\tdesktop_entry: '%s'\n", r->desktop_entry);
-        if (r->match_dbus_timeout != -1) printf("\tmatch_dbus_timeout: %ld\n", r->match_dbus_timeout);
+        if (r->match_dbus_timeout != -1) printf("\tmatch_dbus_timeout: %"G_GINT64_FORMAT"\n", r->match_dbus_timeout);
         if (r->match_transient != -1) printf("\tmatch_transient: %d\n", r->match_transient);
 
         // modifiers
-        if (r->timeout != -1) printf("\ttimeout: %ld\n", r->timeout);
-        if (r->override_dbus_timeout != -1) printf("\toverride_dbus_timeout: %ld\n", r->override_dbus_timeout);
+        if (r->timeout != -1) printf("\ttimeout: %"G_GINT64_FORMAT"\n", r->timeout);
+        if (r->override_dbus_timeout != -1) printf("\toverride_dbus_timeout: %"G_GINT64_FORMAT"\n", r->override_dbus_timeout);
         if (r->markup != -1) printf("\tmarkup: %d\n", r->markup);
         if (r->action_name != NULL) printf("\taction_name: '%s'\n", r->action_name);
         if (r->urgency != URG_NONE) printf("\turgency: '%s'\n", notification_urgency_to_string(r->urgency));

src/settings.c

@@ -115,7 +115,7 @@ static GPtrArray* get_conf_files(void) {
         GPtrArray *config_locations = get_xdg_conf_basedirs();
         GPtrArray *config_files = g_ptr_array_new_full(3, g_free);
         char *dunstrc_location = NULL;
-        for (int i = 0; i < config_locations->len; i++) {
+        for (size_t i = 0; i < config_locations->len; i++) {
                 dunstrc_location = g_build_filename(config_locations->pdata[i],
                                 "dunstrc", NULL);
                 LOG_D("Trying config location: %s", dunstrc_location);

test/dbus.c

@@ -812,7 +812,7 @@ TEST test_hint_transient(void)
                 ASSERT(dbus_notification_fire(n_dbus, &id));
                 ASSERT(id != 0);
 
-                snprintf(msg, sizeof(msg), "In round %ld", i);
+                snprintf(msg, sizeof(msg), "In round %zu", i);
                 ASSERT_EQm(msg, queues_length_waiting(), len+1);
 
                 n = queues_debug_find_notification_by_id(id);
@@ -857,12 +857,12 @@ TEST test_hint_progress(void)
                 ASSERT(dbus_notification_fire(n_dbus, &id));
                 ASSERT(id != 0);
 
-                snprintf(msg, sizeof(msg), "In round %ld", i);
+                snprintf(msg, sizeof(msg), "In round %zu", i);
                 ASSERT_EQm(msg, queues_length_waiting(), len+1);
 
                 n = queues_debug_find_notification_by_id(id);
 
-                snprintf(msg, sizeof(msg), "In round %ld progress should be %i, but is %i", i, n->progress, values[i]);
+                snprintf(msg, sizeof(msg), "In round %zu progress should be %i, but is %i", i, n->progress, values[i]);
                 ASSERT_EQm(msg, values[i], n->progress);
         }
 
@@ -1004,7 +1004,7 @@ TEST test_hint_urgency(void)
 
                 n = queues_debug_find_notification_by_id(id);
 
-                snprintf(msg, sizeof(msg), "In round %ld", i);
+                snprintf(msg, sizeof(msg), "In round %zu", i);
                 ASSERT_EQm(msg, values[i], n->urgency);
 
                 queues_notification_close_id(id, REASON_UNDEF);