From c893bc4aa7a674c6888aacc8249b3c4a8f6bf12a Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Fri, 30 Jan 2009 18:47:32 -0200 Subject: Janitor: Correct make distcheck and compiler warnings. Compiler warnings are spread on other packages, with a warning in the format: /usr/include/X11/Xtrans/Xtranssock.c:548: warning: 'ciptr' may be used uninitialized in this function so the code was slightly changed so that the compiler would not "think" it could be used without initialization. --- .gitignore | 3 +++ Makefile.am | 4 ++-- Xtranssock.c | 10 +++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2a50369..187e984 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ missing mkinstalldirs xtrans.pc *~ +xtrans-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 07e0153..f30b57a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,9 +15,9 @@ aclocal_DATA = xtrans.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtrans.pc -EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} +EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} ChangeLog -CLEANFILES = ChangeLog +MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog diff --git a/Xtranssock.c b/Xtranssock.c index ad3e116..eabb587 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -555,8 +555,12 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, while ((i = TRANS(SocketSelectFamily) (i, transname)) >= 0) { if ((ciptr = TRANS(SocketOpen) ( - i, Sockettrans2devtab[i].devcotsname)) != NULL) + i, Sockettrans2devtab[i].devcotsname)) != NULL) { + /* Save the index for later use */ + + ciptr->index = i; break; + } } if (i < 0) { if (i == -1) @@ -568,10 +572,6 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, return NULL; } - /* Save the index for later use */ - - ciptr->index = i; - return ciptr; } -- cgit v1.2.3