Merge branch 'sunweaver-pr/fix-unused-libNX_X11-files' into 3.6.x

doc/libNX_X11/lcUniConv/README

+
+The files in this directory are taken from the libiconv-1.1 package.
+
+The *.h files were generated from tables (mostly from ftp.unicode.org) using
+the programs '8bit_tab_to_h.c' and 'cjk_tab_to_h.c'. On some of them, further
+optimizations were applied by hand.
+
+If you find a bug in these files, instead of modifying them in XFree86
+and let it diverge from libiconv, please notify the libiconv maintainer
+(currently <bruno@clisp.org>) so he can fix both in synch.
+

nx-X11/lib/X11/Imakefile

@@ -209,11 +209,11 @@ XCURSOR_DEFINES = -DUSE_DYNAMIC_XCURSOR -DLIBXCURSOR=\"libXcursor.so.$(SOXCURSOR
        AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o
        AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c
            SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(EXTRASRCS) /* try *.c if you have trouble */
+           OBJS = $(OBJS1) $(OBJS2) $(OBJS3) $(EXTRAOBJS)
        LINTLIBS =
 
-EXTRASTATICSRC = $(STATICLCSRCS)
-
-EXTRASRCS = $(EXTRASHAREDSRC) $(EXTRASTATICSRC)
+EXTRASRCS = $(STATICLCSRCS)
+EXTRAOBJS = $(STATICLCOBJS)
 
 SRCS1 = \
 	Context.c \
@@ -891,13 +891,6 @@ OBJS3 = \
 	xim_trans.o \
 	$(XKBOBJS) $(LCOBJS)
 
-SHAREDLCDEPSYMSRCS = XlcDL.c XlcSL.c
-
-SHAREDI18NSTATICSRCS = \
-        XDefaultIMIF.c XDefaultOMIF.c
-
-STATICLCDEPSYMSRCS =
-
 STATICI18NSTATICSRCS = \
 	imCallbk.c \
 	imDefFlt.c \
@@ -958,17 +951,8 @@ LCSRCS = \
 	lcUTF8.c
 
 STATICLCSRCS = \
-	$(STATICLCDEPSYMSRCS) \
 	$(STATICI18NSTATICSRCS)
 
-SHAREDLCSRCS = \
-	$(SHAREDLCDEPSYMSRCS) \
-	$(SHAREDI18NSTATICSRCS)
-
-SHAREDLCDEPOBJS = XlcDL.o XlcSL.o
-SHAREDI18NSTATICOBJS = \
-	XDefaultIMIF.o XDefaultOMIF.o
-STATICLCDEPOBJS = 
 STATICI18NSTATICOBJS = \
 	imCallbk.o \
 	imDefFlt.o \
@@ -1029,19 +1013,8 @@ LCOBJS = \
 	lcUTF8.o
 
 STATICLCOBJS = \
-	$(STATICLCDEPOBJS) \
 	$(STATICI18NSTATICOBJS) 
 
-SHAREDLCOBJS = \
-	$(SHAREDLCDEPOBJS) \
-	$(SHAREDI18NSTATICOBJS) 
-
-OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
-
-EXTRAUNSHAREDOBJS = $(STATICLCOBJS)
-
-EXTRASHAREDOBJS = $(STATICLCOBJS)
-
 #include <Library.tmpl>
 
 SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))

nx-X11/lib/X11/XlcSL.c

-/*
-Copyright 1985, 1986, 1987, 1991, 1998  The Open Group
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions: The above copyright notice and this
-permission notice shall be included in all copies or substantial
-portions of the Software.
-
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
-EVEN IF ADVISED IN ADVANCE OF THE POSSIBILITY OF SUCH DAMAGES.
-
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-X Window System is a trademark of The Open Group
-
-OSF/1, OSF/Motif and Motif are registered trademarks, and OSF, the OSF
-logo, LBX, X Window System, and Xinerama are trademarks of the Open
-Group. All other trademarks and registered trademarks mentioned herein
-are the property of their respective owners. No right, title or
-interest in or to any trademark, service mark, logo or trade name of
-Sun Microsystems, Inc. or its licensors is granted.
-
-*/
-/*
- * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-extern XIM _XDefaultOpenIM(
-	XLCd, Display *, XrmDatabase, char *, char *
-			   );
-
-Bool
-_XInitDefaultIM(XLCd lcd)
-{
-    if(lcd == (XLCd)NULL)
-	return False;
-
-    lcd->methods->open_im = _XDefaultOpenIM;
-    lcd->methods->register_callback = NULL;
-    lcd->methods->unregister_callback = NULL;
-    return True;
-}
-
-extern XOM _XDefaultOpenOM(
-    XLCd, Display*, XrmDatabase, _Xconst char*, _Xconst char*
-			   );
-
-Bool
-_XInitDefaultOM(XLCd lcd)
-{
-    lcd->methods->open_om = _XDefaultOpenOM;
-    return True;
-}

nx-X11/lib/X11/lcDynamic.c

-/*
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-/*
- * Copyright 1995 by FUJITSU LIMITED
- * This is source code modified by FUJITSU LIMITED under the Joint
- * Development Agreement for the CDE/Motif PST.
- *
- * Modifier: Takanori Tateno   FUJITSU LIMITED
- *
- */
-
-/*
- * A dynamically loaded locale.
- * Supports: All locale names.
- * How: Loads $(XLOCALEDIR)/xi18n.so and forwards the request to that library.
- * Platforms: Only those defining USE_DYNAMIC_LOADER (none known).
- */
-
-#ifdef USE_DYNAMIC_LOADER
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <dlfcn.h>
-
-#include "Xlibint.h"
-#include "Xlcint.h"
-
-#ifndef XLOCALEDIR
-#define XLOCALEDIR "/usr/lib/X11/locale"
-#endif
-
-#define LCLIBNAME    "xi18n.so"
-
-XLCd
-_XlcDynamicLoader(
-    const char *name)
-{
-    char libpath[1024];
-    XLCdMethods _XlcGenericMethods;
-    XLCd lcd;
-    void *nlshandler;
-
-    snprintf(libpath, sizeof(libpath), "%s/%s/%s",
-	     XLOCALEDIR, name, LCLIBNAME);
-    nlshandler = dlopen(libpath,LAZY);
-    _XlcGenericMethods = (XLCdMethods)dlsym(nlshandler,"genericMethods");
-    lcd = _XlcCreateLC(name,_XlcGenericMethods);
-
-    return lcd;
-}
-#else
-typedef int dummy;
-#endif /* USE_DYNAMIC_LOADER */

nx-X11/lib/X11/lcUTF8.c

@@ -163,9 +163,6 @@ typedef struct _Utf8ConvRec {
 
 #include "lcUniConv/utf8.h"
 #include "lcUniConv/ucs2be.h"
-#ifdef notused
-#include "lcUniConv/ascii.h"
-#endif
 #include "lcUniConv/iso8859_1.h"
 #include "lcUniConv/iso8859_2.h"
 #include "lcUniConv/iso8859_3.h"

nx-X11/lib/X11/lcUniConv/ascii.h

-
-/*
- * ASCII
- */
-
-static int
-ascii_mbtowc (conv_t conv, ucs4_t *pwc, const unsigned char *s, int n)
-{
-  unsigned char c = *s;
-  if (c < 0x80) {
-    *pwc = (ucs4_t) c;
-    return 1;
-  }
-  return RET_ILSEQ;
-}
-
-static int
-ascii_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n)
-{
-  if (wc < 0x0080) {
-    *r = wc;
-    return 1;
-  }
-  return RET_ILSEQ;
-}