Ansification and compile warning fixes.

  This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
make distcheck and all gcc 4.3 and sparse warnings.
parent 5aca565a
......@@ -19,3 +19,7 @@ stamp-h1
xcursorgen
xcursorgen.1
*~
*.o
xcursorgen-*.tar.*
ChangeLog
tags
......@@ -18,7 +18,7 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog
......
......@@ -5,17 +5,23 @@ AC_INIT(xcursorgen, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER(config.h)
AC_PROG_CC
AC_PROG_INSTALL
XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12)
AC_SUBST(XCURSOR_CFLAGS)
AC_SUBST(XCURSOR_LIBS)
XCURSORGEN_CFLAGS="$CWARNFLAGS $XCURSORGEN_CFLAGS"
AC_SUBST(XCURSORGEN_CFLAGS)
AC_SUBST(XCURSORGEN_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile])
......@@ -372,8 +372,8 @@ main (int argc, char *argv[])
{
struct flist *list;
int count;
char *in = 0, *out = 0;
char *prefix = 0;
char *in = NULL, *out = NULL;
char *prefix = NULL;
int i;
for (i = 1; i < argc; i++)
......@@ -404,7 +404,7 @@ main (int argc, char *argv[])
if (strcmp (argv[i], "-p") == 0 || strcmp (argv[i], "--prefix") == 0)
{
i++;
if (argv[i] == 0)
if (argv[i] == NULL)
{
usage (argv[0]);
return 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment