Fix for issue #418 : some warnings about unused functions.

4 files changed, 5 insertions, 45 deletions

diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.H b/src/drivers/Unix/Fl_Unix_System_Driver.H
index bf8a174d8..1d01ebffe 100644
--- a/src/drivers/Unix/Fl_Unix_System_Driver.H
+++ b/src/drivers/Unix/Fl_Unix_System_Driver.H
@@ -50,6 +50,7 @@ public:
   virtual void *control_maximize_button(void *data);
   static unsigned char *create_bmp(const unsigned char *data, int W, int H, int *return_size);
   static Fl_RGB_Image *own_bmp_to_RGB(char *bmp);
+  static void read_int(uchar *c, int& i);
 };
 
 #endif /* FL_NIX_SYSTEM_DRIVER_H */
diff --git a/src/drivers/Unix/Fl_Unix_System_Driver.cxx b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
index 3951e3eda..d956f04b1 100644
--- a/src/drivers/Unix/Fl_Unix_System_Driver.cxx
+++ b/src/drivers/Unix/Fl_Unix_System_Driver.cxx
@@ -2,7 +2,7 @@
 // Definition of Unix/Linux system driver
 // for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2010-2021 by Bill Spitzak and others.
+// Copyright 2010-2022 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -924,7 +924,7 @@ unsigned char *Fl_Unix_System_Driver::create_bmp(const unsigned char *data, int
 }
 
 
-static void read_int(uchar *c, int& i) {
+void Fl_Unix_System_Driver::read_int(uchar *c, int& i) {
   i = *c;
   i |= (*(++c))<<8;
   i |= (*(++c))<<16;
diff --git a/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx b/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
index b6e921fc5..6cfeb092a 100644
--- a/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
+++ b/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx
@@ -481,14 +481,6 @@ static const struct wl_data_device_listener data_device_listener = {
 const struct wl_data_device_listener *Fl_Wayland_Screen_Driver::p_data_device_listener = &data_device_listener;
 
 
-static void read_int(uchar *c, int& i) {
-  i = *c;
-  i |= (*(++c))<<8;
-  i |= (*(++c))<<16;
-  i |= (*(++c))<<24;
-}
-
-
 // Reads from the clipboard an image which can be in image/bmp or image/png MIME type.
 // Returns 0 if OK, != 0 if error.
 static int get_clipboard_image() {
@@ -530,8 +522,8 @@ static int get_clipboard_image() {
     ssize_t n = read(fds[0], buf, sizeof(buf)); // read size info of the BMP image
     if (n == sizeof(buf)) {
       int w, h; // size of the BMP image
-      read_int(buf + 18, w);
-      read_int(buf + 22, h);
+      Fl_Unix_System_Driver::read_int(buf + 18, w);
+      Fl_Unix_System_Driver::read_int(buf + 22, h);
       int R = ((3*w+3)/4) * 4; // the number of bytes per row of BMP image, rounded up to multiple of 4
       bmp = new char[R * h + 54];
       memcpy(bmp, buf, 54);
diff --git a/src/drivers/X11/Fl_X11_System_Driver.cxx b/src/drivers/X11/Fl_X11_System_Driver.cxx
index cbd97b509..d3a81c745 100644
--- a/src/drivers/X11/Fl_X11_System_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_System_Driver.cxx
@@ -70,39 +70,6 @@ extern "C" {
 #endif
 
 
-// Find a program in the path...
-static char *path_find(const char *program, char *filename, int filesize) {
-  const char    *path;                  // Search path
-  char          *ptr,                   // Pointer into filename
-                *end;                   // End of filename buffer
-
-
-  if ((path = fl_getenv("PATH")) == NULL) path = "/bin:/usr/bin";
-
-  for (ptr = filename, end = filename + filesize - 1; *path; path ++) {
-    if (*path == ':') {
-      if (ptr > filename && ptr[-1] != '/' && ptr < end) *ptr++ = '/';
-
-      strlcpy(ptr, program, end - ptr + 1);
-
-      if (!access(filename, X_OK)) return filename;
-
-      ptr = filename;
-    } else if (ptr < end) *ptr++ = *path;
-  }
-
-  if (ptr > filename) {
-    if (ptr[-1] != '/' && ptr < end) *ptr++ = '/';
-
-    strlcpy(ptr, program, end - ptr + 1);
-
-    if (!access(filename, X_OK)) return filename;
-  }
-
-  return 0;
-}
-
-
 void Fl_X11_System_Driver::display_arg(const char *arg) {
   Fl::display(arg);
 }