diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2013-01-16 16:28:20 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-01-16 18:21:51 +0200 |
commit | 3d6d07a7e34e0e767c653008c0eb16ce7ffe5f19 (patch) | |
tree | 80e69b1e149ed232776bce67e862aa0b6053911d /soltools | |
parent | c5fc0af6f551980d3e147f7d6cf1fdd320b8f1fe (diff) |
Get rid of GetVersionInfo and checkdll
With gbuildification neither was actually used anyway, as far as I
could see.
Change-Id: I00d914e6571aed3110226f91ac1685a838031c65
Diffstat (limited to 'soltools')
-rw-r--r-- | soltools/Executable_checkdll.mk | 28 | ||||
-rw-r--r-- | soltools/Module_soltools.mk | 6 | ||||
-rw-r--r-- | soltools/checkdll/checkdll.c | 89 |
3 files changed, 0 insertions, 123 deletions
diff --git a/soltools/Executable_checkdll.mk b/soltools/Executable_checkdll.mk deleted file mode 100644 index de9ccbb41eed..000000000000 --- a/soltools/Executable_checkdll.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Executable_Executable,checkdll)) - -ifeq ($(COM),MSC) -$(eval $(call gb_Executable_use_packages,checkdll,\ - soltools_inc \ -)) -endif - -$(eval $(call gb_Executable_add_cobjects,checkdll,\ - soltools/checkdll/checkdll \ -)) - -ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) -$(eval $(call gb_Executable_add_libs,checkdll,\ - -ldl \ -)) -endif - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk index 12b1d81e9e64..95a802149f34 100644 --- a/soltools/Module_soltools.mk +++ b/soltools/Module_soltools.mk @@ -16,12 +16,6 @@ $(eval $(call gb_Module_add_targets,soltools,\ Executable_makedepend \ )) -ifneq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,soltools,\ - Executable_checkdll \ -)) -endif # UNX - ifeq ($(OS)$(COM),SOLARISC52) $(eval $(call gb_Module_add_targets,soltools,\ Executable_adjustvisibility \ diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c deleted file mode 100644 index 64f2877f9227..000000000000 --- a/soltools/checkdll/checkdll.c +++ /dev/null @@ -1,89 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include <unistd.h> -#include <dlfcn.h> - -/* - * NOTE: Since no one is really interested in correct unload behavior I've - * disabled the shared library unload check. If you want to reenable it comment - * the following line out - */ -#define NO_UNLOAD_CHECK - -static const char *pprog_name = "checkdll"; -static const char *psymbol = "GetVersionInfo"; - -void usage() -{ - fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name); - return; -} - -int main(int argc, char *argv[]) -{ - int silent=0; - void *phandle; - char *(*pfun)(void); - - if ( argc < 2 || argc > 4) { - usage(); - return 1; - } - - if ( !strcmp(argv[1],"-s") ) { - silent = 1; - ++argv, --argc; - } - - if ( access( argv[1], R_OK ) == -1 ) { - fprintf(stderr, "%s: ERROR: %s: %s\n", - pprog_name, argv[1], strerror(errno)); - return 2; - } - - if (!silent) printf("Checking DLL %s ...", argv[1]); - fflush(stdout); - - if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) { - if ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) { - if (!silent) printf(": ok\n"); - } - else - { - printf(": WARNING: %s\n", dlerror()); - } -#ifdef NO_UNLOAD_CHECK - _exit(0); -#else - dlclose(phandle); -#endif - return 0; - } - - printf(": ERROR: %s\n", dlerror()); - return 3; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |