Merge remote-tracking branch 'upstream/next' into wayland

lbonn · Feb 18, 2024 · a4c8135 · a4c8135
2 parents 070c830 + 1c8159c
commit a4c8135
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -74,7 +74,7 @@ AM_PROG_AR
 dnl ---------------------------------------------------------------------
 dnl Base CFLAGS
 dnl ---------------------------------------------------------------------
-AM_CFLAGS="-Wall -Wextra -Wparentheses -Winline -pedantic  -Wunreachable-code"
+AM_CFLAGS="-Wall -Wextra -Wparentheses -Winline -pedantic -Wno-overlength-strings -Wunreachable-code"
 
 dnl ---------------------------------------------------------------------
 dnl Enable source code coverage reporting for GCC

diff --git a/meson.build b/meson.build
@@ -22,6 +22,7 @@ flags = [
     '-Winline',
     '-Wunreachable-code',
     '-Werror=missing-prototypes',
+    '-Wno-overlength-strings',
     '-Wno-inline' # A bit too noisy with Bison…
 ]
 foreach f : flags

diff --git a/source/modes/drun.c b/source/modes/drun.c
@@ -1012,6 +1012,7 @@ static gboolean drun_read_cache(DRunModePrivateData *pd,
     drun_read_stringv(fd, &(entry->keywords));
 
     drun_read_string(fd, &(entry->comment));
+    drun_read_string(fd, &(entry->url));
     int32_t type = 0;
     drun_read_integer(fd, &(type));
     entry->type = type;

diff --git a/source/modes/recursivebrowser.c b/source/modes/recursivebrowser.c
@@ -339,7 +339,7 @@ static unsigned int recursive_browser_mode_get_num_entries(const Mode *sw) {
   return pd->array_length;
 }
 
-static ModeMode recursive_browser_mode_result(Mode *sw, int mretv, char **input,
+static ModeMode recursive_browser_mode_result(Mode *sw, int mretv, G_GNUC_UNUSED char **input,
                                               unsigned int selected_line) {
   ModeMode retv = MODE_EXIT;
   FileBrowserModePrivateData *pd =

diff --git a/source/rofi-icon-fetcher.c b/source/rofi-icon-fetcher.c
@@ -367,7 +367,7 @@ static void rofi_icon_fetcher_worker(thread_state *sdata,
       gdk_pixbuf_new_from_file_at_scale(icon_path, width, height, TRUE, &error);
   if (error != NULL) {
     g_warning("Failed to load image: |%s| %d %d %s (%p)", icon_path,
-              sentry->wsize, sentry->hsize, error->message, pb);
+              sentry->wsize, sentry->hsize, error->message, (void*)pb);
     g_error_free(error);
     if (pb) {
       g_object_unref(pb);

diff --git a/source/xcb/display.c b/source/xcb/display.c
@@ -776,7 +776,7 @@ static int monitor_get_dimension(int monitor_id, workarea *mon) {
 // find the dimensions of the monitor displaying point x,y
 static void monitor_dimensions(int x, int y, workarea *mon) {
   if (mon == NULL) {
-    g_error("%s: mon == NULL", __FUNCTION__);
+    g_error("%s: mon == NULL", __func__);
     return;
   }
   memset(mon, 0, sizeof(workarea));
@@ -818,7 +818,7 @@ static int pointer_get(xcb_window_t root, int *x, int *y) {
 }
 static int monitor_active_from_winid(xcb_drawable_t id, workarea *mon) {
   if (mon == NULL) {
-    g_error("%s: mon == NULL", __FUNCTION__);
+    g_error("%s: mon == NULL", __func__);
     return FALSE;
   }
   xcb_window_t root = xcb->screen->root;
@@ -851,7 +851,7 @@ static int monitor_active_from_id_focused(int mon_id, workarea *mon) {
   xcb_window_t active_window;
   xcb_get_property_cookie_t awc;
   if (mon == NULL) {
-    g_error("%s: mon == NULL", __FUNCTION__);
+    g_error("%s: mon == NULL", __func__);
     return retv;
   }
   awc = xcb_ewmh_get_active_window(&xcb->ewmh, xcb->screen_nbr);
@@ -920,7 +920,7 @@ static int monitor_active_from_id(int mon_id, workarea *mon) {
   xcb_window_t root = xcb->screen->root;
   int x, y;
   if (mon == NULL) {
-    g_error("%s: mon == NULL", __FUNCTION__);
+    g_error("%s: mon == NULL", __func__);
     return FALSE;
   }
   g_debug("Monitor id: %d", mon_id);
@@ -999,7 +999,7 @@ workarea mon_cache = {
 };
 static int xcb_display_monitor_active(workarea *mon) {
   if (mon == NULL) {
-    g_error("%s: mon == NULL", __FUNCTION__);
+    g_error("%s: mon == NULL", __func__);
     return FALSE;
   }
   g_debug("Monitor active");