diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am index 098c71e2a..32bb57e5c 100644 --- a/cde/programs/dtksh/Makefile.am +++ b/cde/programs/dtksh/Makefile.am @@ -57,7 +57,6 @@ dtksh_SOURCES = init.c \ xmcmds.c \ xmwidgets.c \ extra.c \ - findsym.c \ msgs.c init.c: diff --git a/cde/programs/dtksh/findsym.c b/cde/programs/dtksh/findsym.c deleted file mode 100644 index 097c5804a..000000000 --- a/cde/programs/dtksh/findsym.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * CDE - Common Desktop Environment - * - * Copyright (c) 1993-2012, The Open Group. All rights reserved. - * - * These libraries and programs are free software; you can - * redistribute them and/or modify them under the terms of the GNU - * Lesser General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * These libraries and programs are distributed in the hope that - * they will be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU Lesser General Public License for more - * details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with these libraries and programs; if not, write - * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth - * Floor, Boston, MA 02110-1301 USA - */ -/* $XConsortium: findsym.c /main/5 1995/11/09 09:32:59 rswiston $ */ - -/* Copyright (c) 1991, 1992 UNIX System Laboratories, Inc. */ -/* All Rights Reserved */ - -/* THIS IS UNPUBLISHED PROPRIETARY SOURCE CODE OF */ -/* UNIX System Laboratories, Inc. */ -/* The copyright notice above does not evidence any */ -/* actual or intended publication of such source code. */ - -#include "shell.h" -#include "stdio.h" -#include - -#ifdef __aix -#include -#else -#include -#endif - -#include -#include -#include -#include "msgs.h" - -/* - * This function is currently only used to locate a widget class record, - * as requested by a DtLoadWidget request. - */ - -void * -fsym( - char *str, - int lib ) -{ - int i = 0; - void * addr; - - if (liblist == NULL) - return (NULL); - while (liblist[i].dll) - { - if (addr = dlsym(liblist[i].dll, str)) - return(addr); - i++; - } - - return(0); -} diff --git a/cde/programs/dtksh/widget.c b/cde/programs/dtksh/widget.c index 3595cc6fe..364c96e97 100644 --- a/cde/programs/dtksh/widget.c +++ b/cde/programs/dtksh/widget.c @@ -33,6 +33,7 @@ #include "name.h" #include "shell.h" #include +#include #include #include #include @@ -576,6 +577,32 @@ fixupresources( } } +/* + * This function is currently only used to locate a widget class record, + * as requested by a DtLoadWidget request. + */ + +static void * +fsym( + char *str, + int lib ) +{ + int i = 0; + void * addr; + + if (liblist == NULL) + return (NULL); + while (liblist[i].dll) + { + if (addr = dlsym(liblist[i].dll, str)) + return(addr); + i++; + } + + return(0); +} + + int do_DtLoadWidget( int argc,