Janitor: ansification, make distcheck, compiler warnings.

Only convert to use "ansi prototypes" the functions warned from
compilation with "./autogen.sh --prefix=/usr", on a Linux computer.

  Also, only address "trivial" compiler warning fixes in this commit.

  The new .gitignore is the output of a command like:
% find . -name .gitignore -exec cat {} \; | sort | uniq
and only the toplevel .gitignore file was kept.
This commit is contained in:
Paulo Cesar Pereira de Andrade 2009-01-28 20:31:42 -02:00
parent 091c1624fd
commit 8ba0ca32a6
108 changed files with 150 additions and 685 deletions

57
.gitignore vendored
View file

@ -1,42 +1,61 @@
*~
*.3*
*.a
aclocal.m4
autom4te.cache
build*
ChangeLog
compile
Compose
compose.dir
compose.dir.l1
compose.dir.l2
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.lineno
cscope*
depcomp
.deps
doltcompile
doltlibtool
force
install-sh
ks_tables.h
*.la
.libs
libtool
libX11-*
*.lo
local
locale.alias
locale.alias.l1
locale.alias.l2
locale.dir
locale.dir.l1
locale.dir.l2
ltmain.sh
Makefile
Makefile.in
makekeys
MakeOut
missing
mkinstalldirs
*.mode1v3
.msg
*.o
obj*
*.pbxuser
stamp-h1
stamp-h2
.*sw?
tags
TAGS
x11.pc
x11-xcb.pc
*~
libX11-*
local
TAGS
tags
.deps
.libs
.msg
*.lo
*.la
*.a
*.o
*~
.*sw?
*.pbxuser
*.mode1v3
obj*
build*
cscope*
XLC_LOCALE
XlibConf.h

View file

@ -11,7 +11,7 @@ if XCB
pkgconfig_DATA += x11-xcb.pc
endif
EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog autogen.sh
EXTRA_DIST=x11.pc.in x11-xcb.pc.in ChangeLog
MAINTAINERCLEANFILES=ChangeLog
DISTCLEANFILES = doltcompile doltlibtool
@ -19,7 +19,7 @@ DISTCLEANFILES = doltcompile doltlibtool
.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

View file

@ -14,14 +14,15 @@ AM_MAINTAINER_MODE
AM_CONFIG_HEADER([src/config.h])
AC_CONFIG_HEADER([include/X11/XlibConf.h])
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.1)
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.2)
# Checks for programs.
AC_PROG_LIBTOOL
DOLT
AC_PROG_CC
XORG_CWARNFLAGS
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
@ -380,8 +381,7 @@ X11_LIBDIR="${libdir}/X11"
AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
AC_SUBST(X11_LIBDIR)
X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
X11_CFLAGS="$CWARNFLAGS $X11_CFLAGS $XPROTO_CFLAGS"
AC_SUBST(X11_CFLAGS)
AC_SUBST(X11_LIBS)
@ -414,6 +414,7 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
XORG_CHANGELOG
AC_OUTPUT([Makefile
include/Makefile

2
include/.gitignore vendored
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

View file

@ -1,2 +0,0 @@
stamp-h2
XlibConf.h

3
man/.gitignore vendored
View file

@ -1,3 +0,0 @@
*.3*
Makefile
Makefile.in

2
modules/.gitignore vendored
View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -893,13 +893,8 @@ _Ximctsconvert(
}
Public int
_Ximctstombs(xim, from, from_len, to, to_len, state)
XIM xim;
char *from;
int from_len;
char *to;
int to_len;
Status *state;
_Ximctstombs(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state)
{
return _Ximctsconvert(((Xim)xim)->private.proto.ctom_conv,
from, from_len, to, to_len, state);

View file

@ -63,8 +63,7 @@ _XimRegProtoIntrCallback(
}
Public void
_XimFreeProtoIntrCallback(im)
Xim im;
_XimFreeProtoIntrCallback(Xim im)
{
register XimProtoIntrRec *rec, *next;
@ -99,8 +98,7 @@ _XimTransportIntr(
}
Public Bool
_XimDispatchInit(im)
Xim im;
_XimDispatchInit(Xim im)
{
if (_XimRegisterDispatcher(im, _XimTransportIntr, (XPointer)im))
return True;

View file

@ -271,8 +271,7 @@ _XimUnRegisterIMInstantiateCallback(
Public void
_XimResetIMInstantiateCallback( xim )
Xim xim;
_XimResetIMInstantiateCallback(Xim xim)
{
char locale[XIM_MAXLCNAMELEN];
XimInstCallback icb;

View file

@ -75,8 +75,7 @@ _XimSetIMStructureList(
}
Public void
_XimDestroyIMStructureList(im)
Xim im;
_XimDestroyIMStructureList(Xim im)
{
register int i;
@ -90,8 +89,7 @@ _XimDestroyIMStructureList(im)
}
Public void
_XimServerDestroy(im_2_destroy)
Xim im_2_destroy;
_XimServerDestroy(Xim im_2_destroy)
{
register int i;
Xim im;
@ -125,7 +123,7 @@ _XimServerDestroy(im_2_destroy)
#ifdef XIM_CONNECTABLE
Public void
_XimServerReconectableDestroy()
_XimServerReconectableDestroy(void)
{
register int i;
Xim im;
@ -259,8 +257,7 @@ Error1:
}
Public Bool
_XInitIM(lcd)
XLCd lcd;
_XInitIM(XLCd lcd)
{
if(lcd == (XLCd)NULL)
return False;

View file

@ -40,11 +40,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h"
Bool
_XimLocalFilter(d, w, ev, client_data)
Display *d;
Window w;
XEvent *ev;
XPointer client_data;
_XimLocalFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
{
Xic ic = (Xic)client_data;
KeySym keysym;

View file

@ -36,9 +36,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h"
Public char *
_XimLocalGetICValues(xic, values)
XIC xic;
XIMArg *values;
_XimLocalGetICValues(XIC xic, XIMArg *values)
{
Xic ic = (Xic)xic;
XimDefICValues ic_values;

View file

@ -96,8 +96,7 @@ Private int _XimCachedDefaultTreeRefcount = 0;
Public Bool
_XimCheckIfLocalProcessing(im)
Xim im;
_XimCheckIfLocalProcessing(Xim im)
{
FILE *fp;
char *name;

View file

@ -46,13 +46,8 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h"
Public int
_XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
XIC xic;
XKeyEvent *ev;
char *buffer;
int bytes;
KeySym *keysym;
Status *status;
_XimLocalMbLookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
KeySym *keysym, Status *status)
{
Xic ic = (Xic)xic;
int ret;
@ -125,13 +120,8 @@ _XimLocalMbLookupString(xic, ev, buffer, bytes, keysym, status)
}
Public int
_XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
XIC xic;
XKeyEvent *ev;
wchar_t *buffer;
int wlen;
KeySym *keysym;
Status *status;
_XimLocalWcLookupString(XIC xic, XKeyEvent *ev, wchar_t *buffer, int wlen,
KeySym *keysym, Status *status)
{
Xic ic = (Xic)xic;
int ret;
@ -202,13 +192,8 @@ _XimLocalWcLookupString(xic, ev, buffer, wlen, keysym, status)
}
Public int
_XimLocalUtf8LookupString(xic, ev, buffer, bytes, keysym, status)
XIC xic;
XKeyEvent *ev;
char *buffer;
int bytes;
KeySym *keysym;
Status *status;
_XimLocalUtf8LookupString(XIC xic, XKeyEvent *ev, char *buffer, int bytes,
KeySym *keysym, Status *status)
{
Xic ic = (Xic)xic;
int ret;
@ -341,26 +326,16 @@ _XimLcctsconvert(
}
Public int
_XimLcctstombs(xim, from, from_len, to, to_len, state)
XIM xim;
char *from;
int from_len;
char *to;
int to_len;
Status *state;
_XimLcctstombs(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state)
{
return _XimLcctsconvert(((Xim)xim)->private.local.ctom_conv,
from, from_len, to, to_len, state);
}
Public int
_XimLcctstowcs(xim, from, from_len, to, to_len, state)
XIM xim;
char *from;
int from_len;
wchar_t *to;
int to_len;
Status *state;
_XimLcctstowcs(XIM xim, char *from, int from_len,
wchar_t *to, int to_len, Status *state)
{
Xim im = (Xim)xim;
XlcConv conv = im->private.local.ctow_conv;
@ -422,13 +397,8 @@ _XimLcctstowcs(xim, from, from_len, to, to_len, state)
}
Public int
_XimLcctstoutf8(xim, from, from_len, to, to_len, state)
XIM xim;
char *from;
int from_len;
char *to;
int to_len;
Status *state;
_XimLcctstoutf8(XIM xim, char *from, int from_len,
char *to, int to_len, Status *state)
{
return _XimLcctsconvert(((Xim)xim)->private.local.ctoutf8_conv,
from, from_len, to, to_len, state);

View file

@ -39,9 +39,7 @@ PERFORMANCE OF THIS SOFTWARE.
#include "Ximint.h"
Public char *
_XimLocalSetICValues(xic, values)
XIC xic;
XIMArg *values;
_XimLocalSetICValues(XIC xic, XIMArg *values)
{
XimDefICValues ic_values;
Xic ic = (Xic)xic;

View file

@ -2380,10 +2380,7 @@ Public int
}
Public void
_XimSetICMode(res_list, list_num, style)
XIMResourceList res_list;
unsigned int list_num;
XIMStyle style;
_XimSetICMode(XIMResourceList res_list, unsigned int list_num, XIMStyle style)
{
XIMResourceList res;
unsigned int n = XIMNumber(ic_mode);
@ -3018,13 +3015,8 @@ _XimDecodeLocalICAttr(
}
Public char *
_XimGetICValueData(ic, top, res_list, list_num, values, mode)
Xic ic;
XPointer top;
XIMResourceList res_list;
unsigned int list_num;
XIMArg *values;
unsigned long mode;
_XimGetICValueData(Xic ic, XPointer top, XIMResourceList res_list,
unsigned int list_num, XIMArg *values, unsigned long mode)
{
register XIMArg *p;
XIMResourceList res;
@ -3072,9 +3064,7 @@ _XimGetICValueData(ic, top, res_list, list_num, values, mode)
}
Public void
_XimGetCurrentIMValues(im, im_values)
Xim im;
XimDefIMValues *im_values;
_XimGetCurrentIMValues(Xim im, XimDefIMValues *im_values)
{
bzero((char *)im_values, sizeof(XimDefIMValues));
@ -3088,9 +3078,7 @@ _XimGetCurrentIMValues(im, im_values)
}
Public void
_XimSetCurrentIMValues(im, im_values)
Xim im;
XimDefIMValues *im_values;
_XimSetCurrentIMValues(Xim im, XimDefIMValues *im_values)
{
im->core.styles = im_values->styles;
im->core.im_values_list = im_values->im_values_list;
@ -3102,9 +3090,7 @@ _XimSetCurrentIMValues(im, im_values)
}
Public void
_XimGetCurrentICValues(ic, ic_values)
Xic ic;
XimDefICValues *ic_values;
_XimGetCurrentICValues(Xic ic, XimDefICValues *ic_values)
{
bzero((char *)ic_values, sizeof(XimDefICValues));

View file

@ -1240,11 +1240,7 @@ ThaiFltReplaceInput(Xic ic, unsigned char new_char, KeySym symbol)
* Filter function for TACTIS
*/
Bool
_XimThaiFilter(d, w, ev, client_data)
Display *d;
Window w;
XEvent *ev;
XPointer client_data;
_XimThaiFilter(Display *d, Window w, XEvent *ev, XPointer client_data)
{
Xic ic = (Xic)client_data;
KeySym symbol;

View file

@ -61,8 +61,7 @@ Private XIMMethodsRec Xim_im_thai_methods = {
#define THAI_LANGUAGE_NAME "th"
Bool
_XimCheckIfThaiProcessing(im)
Xim im;
_XimCheckIfThaiProcessing(Xim im)
{
char *language;
@ -80,8 +79,7 @@ _XimCheckIfThaiProcessing(im)
}
Public Bool
_XimThaiOpenIM(im)
Xim im;
_XimThaiOpenIM(Xim im)
{
XLCd lcd = im->core.lcd;
XlcConv conv;
@ -150,8 +148,7 @@ Open_Error :
}
Public void
_XimThaiIMFree(im)
Xim im;
_XimThaiIMFree(Xim im)
{
if(im->core.im_resources) {
Xfree(im->core.im_resources);
@ -221,8 +218,7 @@ _XimThaiIMFree(im)
}
Public Status
_XimThaiCloseIM(xim)
XIM xim;
_XimThaiCloseIM(XIM xim)
{
Xim im = (Xim)xim;
XIC ic;

View file

@ -465,9 +465,7 @@ _XimXFlush(Xim im)
}
Public Bool
_XimXConf(im, address)
Xim im;
char *address;
_XimXConf(Xim im, char *address)
{
XSpecRec *spec;

View file

@ -57,15 +57,13 @@ Public TransportSW _XimTransportRec[] = {
};
Public Bool
_XimConnect(im)
Xim im;
_XimConnect(Xim im)
{
return im->private.proto.connect(im);
}
Public Bool
_XimShutdown(im)
Xim im;
_XimShutdown(Xim im)
{
return im->private.proto.shutdown(im);
}
@ -214,15 +212,8 @@ _XimCallDispatcher(
}
Public int
_XimRead(im, len, buf, buf_size, predicate, arg)
Xim im;
INT16 *len;
XPointer buf;
int buf_size;
Bool (*predicate)(
Xim, INT16, XPointer, XPointer
);
XPointer arg;
_XimRead(Xim im, INT16 *len, XPointer buf, int buf_size,
Bool (*predicate)(Xim, INT16, XPointer, XPointer), XPointer arg)
{
INT16 read_len;
int ret_code;
@ -254,16 +245,14 @@ _XimRegisterDispatcher(
}
Public void
_XimFlush(im)
Xim im;
_XimFlush(Xim im)
{
im->private.proto.flush(im);
return;
}
Public Bool
_XimFilterWaitEvent(im)
Xim im;
_XimFilterWaitEvent(Xim im)
{
INT16 read_len;
CARD32 reply32[BUFSIZE/4];

View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -1,2 +0,0 @@
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

11
nls/.gitignore vendored
View file

@ -1,11 +0,0 @@
compose.dir
compose.dir.l1
compose.dir.l2
locale.alias
locale.alias.l1
locale.alias.l2
locale.dir
locale.dir.l1
locale.dir.l2
Makefile
Makefile.in

4
nls/C/.gitignore vendored
View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

4
nls/ja/.gitignore vendored
View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

4
nls/ko/.gitignore vendored
View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

View file

@ -1,4 +0,0 @@
Compose
Makefile
Makefile.in
XLC_LOCALE

12
src/.gitignore vendored
View file

@ -1,12 +0,0 @@
config.h
config.h.in
.deps
force
ks_tables.h
*.la
.libs
*.lo
*.o
Makefile
Makefile.in
stamp-h1

View file

@ -235,11 +235,7 @@ int XSaveContext(
if an error has occured, 0 otherwise. Possible errors are Entry-not-found.
*/
int XFindContext(display, rid, context, data)
Display *display;
register XID rid;
register XContext context;
XPointer *data; /* RETURN */
int XFindContext(Display *display, XID rid, XContext context, XPointer *data)
{
register DB db;
register TableEntry entry;
@ -274,10 +270,7 @@ int XFindContext(display, rid, context, data)
with the same arguments.
*/
int XDeleteContext(display, rid, context)
Display *display;
register XID rid;
register XContext context;
int XDeleteContext(Display *display, XID rid, XContext context)
{
register DB db;
register TableEntry entry, *prev;

View file

@ -788,8 +788,7 @@ _XBigReqHandler(
* before the first possible call on this.
*/
void _XFreeDisplayStructure(dpy)
register Display *dpy;
void _XFreeDisplayStructure(Display *dpy)
{
while (dpy->ext_procs) {
_XExtension *ext = dpy->ext_procs;
@ -914,9 +913,7 @@ void _XFreeDisplayStructure(dpy)
/* OutOfMemory is called if malloc fails. XOpenDisplay returns NULL
after this returns. */
static void OutOfMemory (dpy, setup)
Display *dpy;
char *setup;
static void OutOfMemory(Display *dpy, char *setup)
{
#if USE_XCB
if(dpy->xcb->connection)

View file

@ -2881,10 +2881,7 @@ int _XDefaultError(
}
/*ARGSUSED*/
Bool _XDefaultWireError(display, he, we)
Display *display;
XErrorEvent *he;
xError *we;
Bool _XDefaultWireError(Display *display, XErrorEvent *he, xError *we)
{
return True;
}
@ -3280,9 +3277,7 @@ int _XGetHostname (
* _XScreenOfWindow - get the Screen of a given window
*/
Screen *_XScreenOfWindow (dpy, w)
Display *dpy;
Window w;
Screen *_XScreenOfWindow(Display *dpy, Window w)
{
register int i;
Window root;

View file

@ -2573,12 +2573,8 @@ Bool XrmQGetResource(
}
Bool
XrmGetResource(db, name_str, class_str, pType_str, pValue)
XrmDatabase db;
_Xconst char *name_str;
_Xconst char *class_str;
XrmString *pType_str; /* RETURN */
XrmValuePtr pValue; /* RETURN */
XrmGetResource(XrmDatabase db, _Xconst char *name_str, _Xconst char *class_str,
XrmString *pType_str, XrmValuePtr pValue)
{
XrmName names[MAXDBDEPTH+1];
XrmClass classes[MAXDBDEPTH+1];

View file

@ -597,7 +597,7 @@ xthread_t (*_x11_thr_self)() = __x11_thr_self;
#endif
Status XInitThreads()
Status XInitThreads(void)
{
if (_Xglobal_lock)
return 1;

4
src/util/.gitignore vendored
View file

@ -1,4 +0,0 @@
.deps
Makefile
Makefile.in
makekeys

7
src/xcms/.gitignore vendored
View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

7
src/xkb/.gitignore vendored
View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

View file

@ -669,7 +669,7 @@ register int i;
int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
if ((!xkb) || (!XkbKeycodeInRange(xkb,key)) || (!xkb->map) ||
(!xkb->map->types)||(!newTypes)||((groups&XkbAllGroupsMask)==0)||
(!xkb->map->types)||((groups&XkbAllGroupsMask)==0)||
(nGroups>XkbNumKbdGroups)) {
return BadMatch;
}

View file

@ -1,7 +0,0 @@
*.lo
*.o
*.la
.libs
.deps
Makefile
Makefile.in

Some files were not shown because too many files have changed in this diff Show more