.gitignore | 12 + ChangeLog | 101 ------------- Makefile.am | 10 + README | 25 +++ acinclude.m4 | 47 +++--- configure.ac | 27 +-- cxpm/.gitignore | 5 cxpm/Makefile.am | 8 - cxpm/cxpm.c | 15 - src/.gitignore | 6 src/Attrib.c | 42 ++--- src/CrBufFrI.c | 73 ++++----- src/CrBufFrP.c | 13 - src/CrDatFrI.c | 72 ++++----- src/CrDatFrP.c | 12 - src/CrIFrBuf.c | 27 +-- src/CrIFrDat.c | 27 +-- src/CrIFrP.c | 12 - src/CrPFrBuf.c | 15 - src/CrPFrDat.c | 15 - src/CrPFrI.c | 10 - src/Image.c | 6 src/Info.c | 18 +- src/Makefile.am | 2 src/RdFToBuf.c | 6 src/RdFToDat.c | 6 src/RdFToI.c | 45 +++-- src/RdFToP.c | 15 - src/WrFFrBuf.c | 6 src/WrFFrDat.c | 6 src/WrFFrI.c | 69 ++++----- src/WrFFrP.c | 12 - src/create.c | 417 ++++++++++++++++++++++++++----------------------------- src/data.c | 34 ++-- src/hashtab.c | 29 +-- src/misc.c | 19 +- src/parse.c | 62 ++++---- src/rgb.c | 58 +++---- src/scan.c | 134 ++++++++--------- sxpm/.gitignore | 5 sxpm/Makefile.am | 8 - sxpm/sxpm.c | 55 +++---- 42 files changed, 733 insertions(+), 853 deletions(-)
New commits: commit 130b2fb0ea716143c63ba30856eecb351bc2af2a Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Fri Oct 9 10:32:08 2009 -0700 libXpm 3.5.8 Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/configure.ac b/configure.ac index 5926178..a490a1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.57) -AC_INIT([libXpm], 3.5.7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm) +AC_INIT([libXpm], 3.5.8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXpm) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2]) commit a195bd6d375c311b9bf6d7cce477f1d131425757 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Thu Oct 8 21:29:45 2009 -0700 Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/configure.ac b/configure.ac index ae0f78b..5926178 100644 --- a/configure.ac +++ b/configure.ac @@ -6,19 +6,21 @@ 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) +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) + AM_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC LT_AC_PROG_SED -XORG_CWARNFLAGS + +XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XPM, xproto x11) -XPM_CFLAGS="$CWARNFLAGS $XPM_CFLAGS" AC_SUBST(XPM_CFLAGS) AC_SUBST(XPM_LIBS) @@ -59,13 +61,8 @@ if test x$STAT_ZFILE = xyes ; then fi PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) -SXPM_CFLAGS="$CWARNFLAGS $SXPM_CFLAGS" AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION -XORG_CHANGELOG - AC_OUTPUT([Makefile src/Makefile sxpm/Makefile diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am index 3aecc8c..42cd49d 100644 --- a/cxpm/Makefile.am +++ b/cxpm/Makefile.am @@ -1,7 +1,7 @@ bin_PROGRAMS = cxpm AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include/X11 -AM_CFLAGS = $(XPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS) cxpm_SOURCES = cxpm.c @@ -34,13 +34,13 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ if USE_GETTEXT noinst_DATA = cxpm.po cxpm.po: $(cxpm_SOURCES:%=$(srcdir)/%) - xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%) + $(AM_V_GEN)xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%) CLEANFILES += cxpm.po endif diff --git a/src/Makefile.am b/src/Makefile.am index 5dcdf03..0c8652a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ lib_LTLIBRARIES=libXpm.la AM_CPPFLAGS = -I. -I$(top_srcdir)/include/X11/ -AM_CFLAGS = $(XPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS) libXpm_la_LDFLAGS = -version-number 4:11:0 -no-undefined libXpm_la_LIBADD = $(XPM_LIBS) diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am index 65388f8..faa192c 100644 --- a/sxpm/Makefile.am +++ b/sxpm/Makefile.am @@ -2,7 +2,7 @@ if BUILD_SXPM bin_PROGRAMS = sxpm -AM_CFLAGS = $(SXPM_CFLAGS) +AM_CFLAGS = $(CWARNFLAGS) $(SXPM_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @@ -38,13 +38,13 @@ MAN_SUBSTS = \ SUFFIXES = .$(APP_MAN_SUFFIX) .man .man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ + $(AM_V_GEN)sed $(MAN_SUBSTS) < $< > $@ if USE_GETTEXT noinst_DATA = sxpm.po sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%) - xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%) + $(AM_V_GEN)xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%) CLEANFILES += sxpm.po endif commit f4c43f70dff3cb9702fd62bc388353d02589e618 Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Thu Oct 8 20:27:49 2009 -0700 Replace AC_DEFINE_DIR with AX_DEFINE_DIR from Autoconf Archive diff --git a/acinclude.m4 b/acinclude.m4 index 44971b9..b7501e8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,10 +1,10 @@ # =========================================================================== -# http://www.nongnu.org/autoconf-archive/ac_define_dir.html +# http://www.nongnu.org/autoconf-archive/ax_define_dir.html # =========================================================================== # # SYNOPSIS # -# AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) +# AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION]) # # DESCRIPTION # @@ -16,7 +16,7 @@ # # Example: # -# AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) +# AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) # # LICENSE # @@ -29,17 +29,18 @@ # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. -AC_DEFUN([AC_DEFINE_DIR], [ +AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR]) +AC_DEFUN([AX_DEFINE_DIR], [ prefix_NONE= exec_prefix_NONE= test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn dnl refers to ${prefix}. Thus we have to use `eval' twice. - eval ac_define_dir="\"[$]$2\"" - eval ac_define_dir="\"$ac_define_dir\"" - AC_SUBST($1, "$ac_define_dir") - AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3]) + eval ax_define_dir="\"[$]$2\"" + eval ax_define_dir="\"$ax_define_dir\"" + AC_SUBST($1, "$ax_define_dir") + AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3]) test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE ]) diff --git a/configure.ac b/configure.ac index 34e3ea1..ae0f78b 100644 --- a/configure.ac +++ b/configure.ac @@ -34,7 +34,7 @@ AC_MSG_CHECKING([where to install localized messages]) AC_ARG_WITH([localedir], AC_HELP_STRING([--with-localedir=<path>], [Path to install message files in (default: datadir/locale)]), [LOCALEDIR=${withval}], [LOCALEDIR=${datadir}/locale]) -AC_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages]) +AX_DEFINE_DIR([LOCALEDIR], [LOCALEDIR], [Location of translated messages]) if test "x$LOCALEDIR" = "xno" -o "x$USE_GETTEXT" = "xno" ; then AC_MSG_RESULT([nowhere]) USE_GETTEXT="no" commit d846316822ba8eb545d41140007ef98a7de9274e Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Tue May 19 01:34:19 2009 -0700 Update AC_DEFINE_DIR to latest version from Autoconf Archive diff --git a/acinclude.m4 b/acinclude.m4 index f3d8734..44971b9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,4 +1,6 @@ -##### http://autoconf-archive.cryp.to/ac_define_dir.html +# =========================================================================== +# http://www.nongnu.org/autoconf-archive/ac_define_dir.html +# =========================================================================== # # SYNOPSIS # @@ -6,30 +8,26 @@ # # DESCRIPTION # -# This macro sets VARNAME to the expansion of the DIR variable, -# taking care of fixing up ${prefix} and such. +# This macro sets VARNAME to the expansion of the DIR variable, taking +# care of fixing up ${prefix} and such. # -# VARNAME is then offered as both an output variable and a C -# preprocessor symbol. +# VARNAME is then offered as both an output variable and a C preprocessor +# symbol. # # Example: # # AC_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.]) # -# LAST MODIFICATION +# LICENSE # -# 2006-10-13 +# Copyright (c) 2008 Stepan Kasal <ka...@ucw.cz> +# Copyright (c) 2008 Andreas Schwab <sch...@suse.de> +# Copyright (c) 2008 Guido U. Draheim <gui...@gmx.de> +# Copyright (c) 2008 Alexandre Oliva # -# COPYLEFT -# -# Copyright (c) 2006 Stepan Kasal <ka...@ucw.cz> -# Copyright (c) 2006 Andreas Schwab <sch...@suse.de> -# Copyright (c) 2006 Guido U. Draheim <gui...@gmx.de> -# Copyright (c) 2006 Alexandre Oliva -# -# Copying and distribution of this file, with or without -# modification, are permitted in any medium without royalty provided -# the copyright notice and this notice are preserved. +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. AC_DEFUN([AC_DEFINE_DIR], [ prefix_NONE= commit 53f8b42f89214b85804ae9e64c49d1a9c2a7553d Author: Alan Coopersmith <alan.coopersm...@sun.com> Date: Mon Feb 2 20:34:35 2009 -0800 Add README with pointers to mailing list, bugzilla & git repos Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com> diff --git a/README b/README index e69de29..9d14a39 100644 --- a/README +++ b/README @@ -0,0 +1,25 @@ +libXpm - X Pixmap (XPM) image file format library + +All questions regarding this software should be directed at the +Xorg mailing list: + + http://lists.freedesktop.org/mailman/listinfo/xorg + +Please submit bug reports to the Xorg bugzilla: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +The master development code repository can be found at: + + git://anongit.freedesktop.org/git/xorg/lib/libXpm + + http://cgit.freedesktop.org/xorg/lib/libXpm + +For patch submission instructions, see: + + http://www.x.org/wiki/Development/Documentation/SubmittingPatches + +For more information on the git code manager, see: + + http://wiki.x.org/wiki/GitPage + commit 6697e31fbb616656b7f34515a79454af394b500a Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br> Date: Fri Jan 30 15:45:20 2009 -0200 Janitor: ansification, make distcheck, .gitignore The ansification code is minor edit of the patch (by me) at https://bugs.freedesktop.org/show_bug.cgi?id=14727 as it would not apply cleanly anymore. diff --git a/.gitignore b/.gitignore index a150dfb..e806a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.deps +.libs aclocal.m4 autom4te.cache compile @@ -8,6 +10,7 @@ config.log config.status config.sub configure +cxpm depcomp install-sh libtool @@ -18,5 +21,14 @@ MakeOut missing mkinstalldirs stamp-h1 +sxpm xpm.pc *~ +*.1 +*.o +*.la +*.lo +*.po +libXpm-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index a3890f7..d6e7b29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,6 @@ 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 diff --git a/configure.ac b/configure.ac index 3174b30..34e3ea1 100644 --- a/configure.ac +++ b/configure.ac @@ -5,15 +5,20 @@ 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]) # Checks for programs. AC_PROG_LIBTOOL AC_PROG_CC LT_AC_PROG_SED +XORG_CWARNFLAGS # Checks for pkg-config packages PKG_CHECK_MODULES(XPM, xproto x11) +XPM_CFLAGS="$CWARNFLAGS $XPM_CFLAGS" AC_SUBST(XPM_CFLAGS) AC_SUBST(XPM_LIBS) @@ -23,15 +28,6 @@ AC_HEADER_STDC # Checks for functions AC_CHECK_FUNCS([strlcat]) -# Checks for typedefs, structures, and compiler characteristics. - -if test "x$GCC" = "xyes"; then - GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wnested-externs -fno-strict-aliasing" - CFLAGS="$GCC_WARNINGS $CFLAGS" -fi - # Internationalization & localization support AC_SEARCH_LIBS([gettext], [intl], [USE_GETTEXT="yes"], [USE_GETTEXT="no"]) AC_MSG_CHECKING([where to install localized messages]) @@ -63,11 +59,12 @@ if test x$STAT_ZFILE = xyes ; then fi PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) - +SXPM_CFLAGS="$CWARNFLAGS $SXPM_CFLAGS" AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile src/Makefile diff --git a/cxpm/.gitignore b/cxpm/.gitignore deleted file mode 100644 index 4c621a5..0000000 --- a/cxpm/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -cxpm -.deps -.libs -Makefile -Makefile.in diff --git a/cxpm/cxpm.c b/cxpm/cxpm.c index ed0c7c8..c5cf289 100644 --- a/cxpm/cxpm.c +++ b/cxpm/cxpm.c @@ -56,9 +56,7 @@ * note that 's' could stand both for "special" and "slow" ;-) */ static int -sGetc(data, file) - xpmData *data; - FILE *file; +sGetc(xpmData *data, FILE *file) { int c = getc(data->stream.file); if (c == '\n') { @@ -71,10 +69,7 @@ sGetc(data, file) } static void -sUngetc(data, c, file) - xpmData *data; - int c; - FILE *file; +sUngetc(xpmData *data, int c, FILE *file) { ungetc(c, data->stream.file); if (c == '\n') { @@ -143,9 +138,7 @@ ErrorMessage( } int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { XpmImage image; char *filename; diff --git a/src/.gitignore b/src/.gitignore deleted file mode 100644 index 666c770..0000000 --- a/src/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -libXpm.la -*.lo -Makefile -Makefile.in diff --git a/src/Attrib.c b/src/Attrib.c index a6feb52..cb304df 100644 --- a/src/Attrib.c +++ b/src/Attrib.c @@ -49,10 +49,10 @@ LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, unsigned int ncolors)); * Create a colortable compatible with the old style colortable */ static int -CreateOldColorTable(ct, ncolors, oldct) - XpmColor *ct; - unsigned int ncolors; - XpmColor ***oldct; +CreateOldColorTable( + XpmColor *ct, + unsigned int ncolors, + XpmColor ***oldct) { XpmColor **colorTable, **color; unsigned int a; @@ -72,9 +72,9 @@ CreateOldColorTable(ct, ncolors, oldct) } static void -FreeOldColorTable(colorTable, ncolors) - XpmColor **colorTable; - unsigned int ncolors; +FreeOldColorTable( + XpmColor **colorTable, + unsigned int ncolors) { unsigned int a, b; XpmColor **color; @@ -97,9 +97,9 @@ FreeOldColorTable(colorTable, ncolors) * Free the computed color table */ void -xpmFreeColorTable(colorTable, ncolors) - XpmColor *colorTable; - int ncolors; +xpmFreeColorTable( + XpmColor *colorTable, + int ncolors) { int a, b; XpmColor *color; @@ -119,9 +119,9 @@ xpmFreeColorTable(colorTable, ncolors) * Free array of extensions */ void -XpmFreeExtensions(extensions, nextensions) - XpmExtension *extensions; - int nextensions; +XpmFreeExtensions( + XpmExtension *extensions, + int nextensions) { unsigned int i, j, nlines; XpmExtension *ext; @@ -147,7 +147,7 @@ XpmFreeExtensions(extensions, nextensions) */ int -XpmAttributesSize() +XpmAttributesSize(void) { return sizeof(XpmAttributes); } @@ -156,8 +156,7 @@ XpmAttributesSize() * Init returned data to free safely later on */ void -xpmInitAttributes(attributes) - XpmAttributes *attributes; +xpmInitAttributes(XpmAttributes *attributes) { if (attributes) { attributes->pixels = NULL; @@ -184,10 +183,10 @@ xpmInitAttributes(attributes) * Fill in the XpmAttributes with the XpmImage and the XpmInfo */ void -xpmSetAttributes(attributes, image, info) - XpmAttributes *attributes; - XpmImage *image; - XpmInfo *info; +xpmSetAttributes( + XpmAttributes *attributes, + XpmImage *image, + XpmInfo *info) { if (attributes->valuemask & XpmReturnColorTable) { attributes->colorTable = image->colorTable; @@ -254,8 +253,7 @@ xpmSetAttributes(attributes, image, info) * but the structure itself */ void -XpmFreeAttributes(attributes) - XpmAttributes *attributes; +XpmFreeAttributes(XpmAttributes *attributes) { if (attributes->valuemask & XpmReturnPixels && attributes->npixels) { XpmFree(attributes->pixels); diff --git a/src/CrBufFrI.c b/src/CrBufFrI.c index b879715..a53b117 100644 --- a/src/CrBufFrI.c +++ b/src/CrBufFrI.c @@ -59,12 +59,12 @@ LFUNC(ExtensionsSize, unsigned int, (XpmExtension *ext, unsigned int num)); LFUNC(CommentsSize, int, (XpmInfo *info)); int -XpmCreateBufferFromImage(display, buffer_return, image, shapeimage, attributes) - Display *display; - char **buffer_return; - XImage *image; - XImage *shapeimage; - XpmAttributes *attributes; +XpmCreateBufferFromImage( + Display *display, + char **buffer_return, + XImage *image, + XImage *shapeimage, + XpmAttributes *attributes) { XpmImage xpmimage; XpmInfo info; @@ -105,10 +105,10 @@ do \ }while(0) int -XpmCreateBufferFromXpmImage(buffer_return, image, info) - char **buffer_return; - XpmImage *image; - XpmInfo *info; +XpmCreateBufferFromXpmImage( + char **buffer_return, + XpmImage *image, + XpmInfo *info) { /* calculation variables */ int ErrorStatus; @@ -271,13 +271,13 @@ error: static int -WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) - char **dataptr; - unsigned int *data_size; - unsigned int *used_size; - XpmColor *colors; - unsigned int ncolors; - unsigned int cpp; +WriteColors( + char **dataptr, + unsigned int *data_size, + unsigned int *used_size, + XpmColor *colors, + unsigned int ncolors, + unsigned int cpp) { char buf[BUFSIZ] = {0}; unsigned int a, key, l; @@ -329,15 +329,15 @@ WriteColors(dataptr, data_size, used_size, colors, ncolors, cpp) } static void -WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors) - char *dataptr; - unsigned int data_size; - unsigned int *used_size; - unsigned int width; - unsigned int height; - unsigned int cpp; - unsigned int *pixels; - XpmColor *colors; +WritePixels( + char *dataptr, + unsigned int data_size, + unsigned int *used_size, + unsigned int width, + unsigned int height, + unsigned int cpp, + unsigned int *pixels, + XpmColor *colors) { char *s = dataptr; unsigned int x, y, h; @@ -372,9 +372,9 @@ WritePixels(dataptr, data_size, used_size, width, height, cpp, pixels, colors) } static unsigned int -ExtensionsSize(ext, num) - XpmExtension *ext; - unsigned int num; +ExtensionsSize( + XpmExtension *ext, + unsigned int num) { unsigned int x, y, a, size; char **line; @@ -397,12 +397,12 @@ ExtensionsSize(ext, num) } static void -WriteExtensions(dataptr, data_size, used_size, ext, num) - char *dataptr; - unsigned int data_size; - unsigned int *used_size; - XpmExtension *ext; - unsigned int num; +WriteExtensions( + char *dataptr, + unsigned int data_size, + unsigned int *used_size, + XpmExtension *ext, + unsigned int num) { unsigned int x, y, a; char **line; @@ -432,8 +432,7 @@ WriteExtensions(dataptr, data_size, used_size, ext, num) } static int -CommentsSize(info) - XpmInfo *info; +CommentsSize(XpmInfo *info) { int size = 0; diff --git a/src/CrBufFrP.c b/src/CrBufFrP.c index 44eb56d..de3e776 100644 --- a/src/CrBufFrP.c +++ b/src/CrBufFrP.c @@ -38,13 +38,12 @@ #include "XpmI.h" int -XpmCreateBufferFromPixmap(display, buffer_return, pixmap, shapemask, - attributes) - Display *display; - char **buffer_return; - Pixmap pixmap; - Pixmap shapemask; - XpmAttributes *attributes; +XpmCreateBufferFromPixmap( + Display *display, + char **buffer_return, + Pixmap pixmap, + Pixmap shapemask, + XpmAttributes *attributes) { XImage *ximage = NULL; XImage *shapeimage = NULL; diff --git a/src/CrDatFrI.c b/src/CrDatFrI.c index 9099966..aa1d893 100644 --- a/src/CrDatFrI.c +++ b/src/CrDatFrI.c @@ -59,12 +59,12 @@ LFUNC(CreateExtensions, void, (char **dataptr, unsigned int data_size, unsigned int ext_nlines)); int -XpmCreateDataFromImage(display, data_return, image, shapeimage, attributes) - Display *display; - char ***data_return; - XImage *image; - XImage *shapeimage; - XpmAttributes *attributes; +XpmCreateDataFromImage( + Display *display, + char ***data_return, + XImage *image, + XImage *shapeimage, + XpmAttributes *attributes) { XpmImage xpmimage; XpmInfo info; @@ -102,10 +102,10 @@ do \ } while(0) int -XpmCreateDataFromXpmImage(data_return, image, info) - char ***data_return; - XpmImage *image; - XpmInfo *info; +XpmCreateDataFromXpmImage( + char ***data_return, + XpmImage *image, + XpmInfo *info) { /* calculation variables */ int ErrorStatus; @@ -244,12 +244,12 @@ exit: } static int -CreateColors(dataptr, data_size, colors, ncolors, cpp) - char **dataptr; - unsigned int *data_size; - XpmColor *colors; - unsigned int ncolors; - unsigned int cpp; +CreateColors( + char **dataptr, + unsigned int *data_size, + XpmColor *colors, + unsigned int ncolors, + unsigned int cpp) { char buf[BUFSIZ]; unsigned int a, key, l; @@ -295,14 +295,14 @@ CreateColors(dataptr, data_size, colors, ncolors, cpp) } static void -CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors) - char **dataptr; - unsigned int data_size; - unsigned int width; - unsigned int height; - unsigned int cpp; - unsigned int *pixels; - XpmColor *colors; +CreatePixels( + char **dataptr, + unsigned int data_size, + unsigned int width, + unsigned int height, + unsigned int cpp, + unsigned int *pixels, + XpmColor *colors) { char *s; unsigned int x, y, h, offset; @@ -345,11 +345,11 @@ CreatePixels(dataptr, data_size, width, height, cpp, pixels, colors) } static void -CountExtensions(ext, num, ext_size, ext_nlines) - XpmExtension *ext; - unsigned int num; - unsigned int *ext_size; - unsigned int *ext_nlines; +CountExtensions( + XpmExtension *ext, + unsigned int num, + unsigned int *ext_size, + unsigned int *ext_nlines) { unsigned int x, y, a, size, nlines; char **line; @@ -371,13 +371,13 @@ CountExtensions(ext, num, ext_size, ext_nlines) } static void -CreateExtensions(dataptr, data_size, offset, ext, num, ext_nlines) - char **dataptr; - unsigned int data_size; - unsigned int offset; - XpmExtension *ext; - unsigned int num; - unsigned int ext_nlines; +CreateExtensions( + char **dataptr, + unsigned int data_size, + unsigned int offset, + XpmExtension *ext, + unsigned int num, + unsigned int ext_nlines) { unsigned int x, y, a, b; char **line; diff --git a/src/CrDatFrP.c b/src/CrDatFrP.c index 20981b7..0e17fee 100644 --- a/src/CrDatFrP.c +++ b/src/CrDatFrP.c @@ -38,12 +38,12 @@ #include "XpmI.h" int -XpmCreateDataFromPixmap(display, data_return, pixmap, shapemask, attributes) - Display *display; - char ***data_return; - Pixmap pixmap; - Pixmap shapemask; - XpmAttributes *attributes; +XpmCreateDataFromPixmap( + Display *display, + char ***data_return, + Pixmap pixmap, + Pixmap shapemask, + XpmAttributes *attributes) { XImage *ximage = NULL; XImage *shapeimage = NULL; diff --git a/src/CrIFrBuf.c b/src/CrIFrBuf.c index d98e658..b6b12ca 100644 --- a/src/CrIFrBuf.c +++ b/src/CrIFrBuf.c @@ -40,13 +40,12 @@ LFUNC(OpenBuffer, void, (char *buffer, xpmData *mdata)); int -XpmCreateImageFromBuffer(display, buffer, image_return, - shapeimage_return, attributes) - Display *display; - char *buffer; - XImage **image_return; - XImage **shapeimage_return; - XpmAttributes *attributes; +XpmCreateImageFromBuffer( + Display *display, + char *buffer, + XImage **image_return, + XImage **shapeimage_return, + XpmAttributes *attributes) { XpmImage image; XpmInfo info; @@ -83,10 +82,10 @@ XpmCreateImageFromBuffer(display, buffer, image_return, } int -XpmCreateXpmImageFromBuffer(buffer, image, info) - char *buffer; - XpmImage *image; - XpmInfo *info; +XpmCreateXpmImageFromBuffer( + char *buffer, + XpmImage *image, + XpmInfo *info) { xpmData mdata; int ErrorStatus; @@ -108,9 +107,9 @@ XpmCreateXpmImageFromBuffer(buffer, image, info) * open the given buffer to be read or written as an xpmData which is returned */ static void -OpenBuffer(buffer, mdata) - char *buffer; - xpmData *mdata; +OpenBuffer( + char *buffer, + xpmData *mdata) { mdata->type = XPMBUFFER; mdata->cptr = buffer; diff --git a/src/CrIFrDat.c b/src/CrIFrDat.c index ab93a49..9ef1557 100644 --- a/src/CrIFrDat.c +++ b/src/CrIFrDat.c @@ -40,13 +40,12 @@ LFUNC(OpenArray, void, (char **data, xpmData *mdata)); int -XpmCreateImageFromData(display, data, image_return, - shapeimage_return, attributes) - Display *display; - char **data; - XImage **image_return; - XImage **shapeimage_return; - XpmAttributes *attributes; +XpmCreateImageFromData( + Display *display, + char **data, + XImage **image_return, + XImage **shapeimage_return, + XpmAttributes *attributes) { XpmImage image; XpmInfo info; -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org