Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up some build warnings #759

Merged
merged 3 commits into from
Nov 11, 2022
Merged

Clean up some build warnings #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6909921
Remove autoconf tests for gdk_imlib.
somiaj Nov 10, 2022
48cc96a
Fix warn_unused_result warnings.
somiaj Nov 10, 2022
fc7e95f
Remove unused variable definitions from x_pager.c.
somiaj Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
158 changes: 0 additions & 158 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,164 +336,6 @@ CPPFLAGS="$mg_save_CPPFLAGS"
])


# Check for gdk-imlib
AC_DEFUN([AM_PATH_GDK_IMLIB],
[dnl
dnl Get the cflags and libraries from the imlib-config script
dnl
AC_ARG_WITH(imlib-prefix,AS_HELP_STRING([--with-imlib-prefix=PFX],[prefix for IMLIB files (optional)]),
imlib_prefix="$withval", imlib_prefix="")
AC_ARG_WITH(imlib-exec-prefix,AS_HELP_STRING([--with-imlib-exec-prefix=PFX],[exec prefix for IMLIB files (optional)]),
imlib_exec_prefix="$withval", imlib_exec_prefix="")
AC_ARG_ENABLE(imlibtest,AS_HELP_STRING([--disable-imlibtest],[do not try to compile and run a test IMLIB program]),
, enable_imlibtest=yes)

if test x$imlib_exec_prefix != x ; then
imlib_args="$imlib_args --exec-prefix=$imlib_exec_prefix"
if test x${IMLIBCONF+set} != xset ; then
IMLIBCONF=$imlib_exec_prefix/bin/imlib-config
fi
fi
if test x$imlib_prefix != x ; then
imlib_args="$imlib_args --prefix=$imlib_prefix"
if test x${IMLIBCONF+set} != xset ; then
IMLIBCONF=$imlib_prefix/bin/imlib-config
fi
fi

AC_PATH_PROG(IMLIBCONF, imlib-config, no)
min_imlib_version=ifelse([$1], ,1.8.1,$1)
AC_MSG_CHECKING(for GDK IMLIB - version >= $min_imlib_version)
no_imlib=""
if test "$IMLIBCONF" = "no" ; then
no_imlib=yes
else
GDK_IMLIB_CFLAGS=`$IMLIBCONF $imlibconf_args --cflags-gdk`
GDK_IMLIB_LIBS=`$IMLIBCONF $imlibconf_args --libs-gdk`

imlib_major_version=`$IMLIBCONF $imlib_args --version | \
sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/'`
imlib_minor_version=`$IMLIBCONF $imlib_args --version | \
sed 's/^[[^0-9.]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\2/'`
if test "x$enable_imlibtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
LIBS="$LIBS $GDK_IMLIB_LIBS"
dnl
dnl Now check if the installed IMLIB is sufficiently new. (Also sanity
dnl checks the results of imlib-config to some extent
dnl
rm -f conf.imlibtest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <gdk_imlib.h>

/* migo: originally it was GdkImLibColor with incorrect spelling */
GdkImlibImage testimage;

int main ()
{
int major, minor;
char *tmp_version;

system ("touch conf.gdkimlibtest");

/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_imlib_version");
if (sscanf(tmp_version, "%d.%d", &major, &minor) != 2) {
printf("%s, bad version string\n", "$min_imlib_version");
exit(1);
}

if (($imlib_major_version > major) ||
(($imlib_major_version == major) && ($imlib_minor_version > minor)))
{
return 0;
}
else
{
printf("\n*** 'imlib-config --version' returned %d.%d, but the minimum version\n", $imlib_major_version, $imlib_minor_version);
printf("*** of IMLIB required is %d.%d. If imlib-config is correct, then it is\n", major, minor);
printf("*** best to upgrade to the required version.\n");
printf("*** If imlib-config was wrong, set the environment variable IMLIBCONF\n");
printf("*** to point to the correct copy of imlib-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}

],, no_imlib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_imlib" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$IMLIBCONF" = "no" ; then
(echo "*** The imlib-config script installed by IMLIB could not be found" >&5) 2>/dev/null || \
echo "*** The imlib-config script installed by IMLIB could not be found"
(echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in" >&5) 2>/dev/null || \
echo "*** If IMLIB was installed in PREFIX, make sure PREFIX/bin is in"
(echo "*** your path, or set the IMLIBCONF environment variable to the" >&5) 2>/dev/null || \
echo "*** your path, or set the IMLIBCONF environment variable to the"
(echo "*** full path to imlib-config." >&5) 2>/dev/null || \
echo "*** full path to imlib-config."
else
if test -f conf.gdkimlibtest ; then
:
else
(echo "*** Could not run IMLIB test program, checking why..." >&5) 2>/dev/null || \
echo "*** Could not run IMLIB test program, checking why..."
CFLAGS="$CFLAGS $GDK_IMLIB_CFLAGS"
LIBS="$LIBS $GDK_IMLIB_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <gdk_imlib.h>
], [ return 0; ],
[ (echo "*** The test program compiled, but did not run. This usually means" >&5) 2>/dev/null || \
echo "*** The test program compiled, but did not run. This usually means"
(echo "*** that the run-time linker is not finding IMLIB or finding the wrong" >&5) 2>/dev/null || \
echo "*** that the run-time linker is not finding IMLIB or finding the wrong"
(echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your" >&5) 2>/dev/null || \
echo "*** version of IMLIB. If it is not finding IMLIB, you'll need to set your"
(echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" >&5) 2>/dev/null || \
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
(echo "*** to the installed location Also, make sure you have run ldconfig if that" >&5) 2>/dev/null || \
echo "*** to the installed location Also, make sure you have run ldconfig if that"
(echo "*** is required on your system" >&5) 2>/dev/null || \
echo "*** is required on your system"
(echo "***" >&5) 2>/dev/null || \
echo "***"
(echo "*** If you have an old version installed, it is best to remove it, although" >&5) 2>/dev/null || \
echo "*** If you have an old version installed, it is best to remove it, although"
(echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" >&5) 2>/dev/null || \
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ (echo "*** The test program failed to compile or link. See the file config.log for the" >&5) 2>/dev/null || \
echo "*** The test program failed to compile or link. See the file config.log for the"
(echo "*** exact error that occurred. This usually means IMLIB was incorrectly installed" >&5) 2>/dev/null || \
echo "*** exact error that occurred. This usually means IMLIB was incorrectly installed"
(echo "*** or that you have moved IMLIB since it was installed. In the latter case, you" >&5) 2>/dev/null || \
echo "*** or that you have moved IMLIB since it was installed. In the latter case, you"
(echo "*** may want to edit the imlib-config script: $IMLIBCONF" >&5) 2>/dev/null || \
echo "*** may want to edit the imlib-config script: $IMLIBCONF"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GDK_IMLIB_CFLAGS=""
GDK_IMLIB_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GDK_IMLIB_CFLAGS)
AC_SUBST(GDK_IMLIB_LIBS)
rm -f conf.gdkimlibtest
])

#
# check if iconv second argument use const char.
#
Expand Down
12 changes: 0 additions & 12 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,18 +1225,6 @@ fi
# list (2001-02-16 and 2001-02-24)
AM_SAFETY_CHECK_MKSTEMP

# ********* IMLIB, GNOME
# Check the availability of gdk-imlib
AH_TEMPLATE([GDK_IMLIB],[Define if gdk-imlib is used])
AM_PATH_GDK_IMLIB(1.8.0, AC_DEFINE(GDK_IMLIB))
if test x"$no_imlib" = x; then
with_gdkimlib=yes
problem_gdkimlib=""
else
with_gdkimlib=no
problem_gdkimlib=": Failed on gdk-imlib, see config.log"
fi

# Define some compatibility macros needed for config.h.
mg_DEFINE_IF_NOT([#include <X11/keysym.h>],
[defined XK_Page_Up && defined XK_Page_Down],
Expand Down
10 changes: 7 additions & 3 deletions modules/FvwmMFL/FvwmMFL.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,11 @@ check_pid(void)
strerror(errno));
exit(1);
}
fscanf(pf, "%d", &pid);
if (fscanf(pf, "%d", &pid) != 1) {
fprintf(stderr, "Error reading pid from %s: %s\n", pid_file,
strerror(errno));
exit(1);
};

/* Non-fatal if we can't close this file handle from reading. */
(void)fclose(pf);
Expand Down Expand Up @@ -288,7 +292,7 @@ send_version_info(struct client *c)
/* Ensure there's a newline at the end of the string, so that
* buffered output can be sent.
*/
asprintf(&to_client, "%s\n", fm->msg);
xasprintf(&to_client, "%s\n", fm->msg);

bufferevent_write(c->comms, to_client, strlen(to_client));
bufferevent_flush(c->comms, EV_WRITE, BEV_NORMAL);
Expand Down Expand Up @@ -669,7 +673,7 @@ broadcast_to_client(FvwmPacket *packet)
/* Ensure there's a newline at the end of the string, so that
* buffered output can be sent.
*/
asprintf(&to_client, "%s\n", fm->msg);
xasprintf(&to_client, "%s\n", fm->msg);

bufferevent_write(c->comms, to_client, strlen(to_client));
bufferevent_flush(c->comms, EV_WRITE, BEV_NORMAL);
Expand Down
1 change: 0 additions & 1 deletion modules/FvwmPager/x_pager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,6 @@ void ReConfigure(void)
rectangle vp = {0, 0, 0, 0};
int i = 0, j = 0, k = 0;
struct fpmonitor *mon = fpmonitor_this();
int VxPages = mon->virtual_scr.VxPages, VyPages = mon->virtual_scr.VyPages;

if (!XGetGeometry(dpy, Scr.Pager_w, &root, &vp.x, &vp.y, (unsigned *)&pwindow.width,
(unsigned *)&pwindow.height, &border_width,&depth))
Expand Down