diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-03-08 20:21:56 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-03-08 20:21:56 +0000 |
| commit | 3f7d906f8cd6edd2597a49f629bd31914de8ca08 (patch) | |
| tree | 4a015d892d777f58f9b88010c76d924227a12cc4 /src/hyper | |
| parent | 6a0809d42bbfb8ae3c00431c69bff92f38e5739c (diff) | |
| download | open-axiom-3f7d906f8cd6edd2597a49f629bd31914de8ca08.tar.gz | |
* include/addfile.h: Move from hyper.
* include/addfile.H1: Move external declarations into
addfile.h. Remove.
Diffstat (limited to 'src/hyper')
| -rw-r--r-- | src/hyper/Makefile.in | 2 | ||||
| -rw-r--r-- | src/hyper/addfile.c | 5 | ||||
| -rw-r--r-- | src/hyper/addfile.h | 41 | ||||
| -rw-r--r-- | src/hyper/htadd.c | 2 |
4 files changed, 7 insertions, 43 deletions
diff --git a/src/hyper/Makefile.in b/src/hyper/Makefile.in index f3896a99..7f976173 100644 --- a/src/hyper/Makefile.in +++ b/src/hyper/Makefile.in @@ -53,7 +53,7 @@ SCRIPTS=${OUTLIB}/htsearch ${OUTLIB}/presea BINFILES= $(addprefix $(OUTLIB)/,$(bin_PROGRAMS)) -HEADERS = addfile.h display.h event.h extent.h \ +HEADERS = display.h event.h extent.h \ group.h hterror.h hyper.h initx.h keyin.h lex.h \ parse.h parse-paste.h parse-types.h scrollbar.h \ titlebar.h token.h $(axiom_c_macros_h) diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c index 2eef5664..b1b97d49 100644 --- a/src/hyper/addfile.c +++ b/src/hyper/addfile.c @@ -38,6 +38,7 @@ #include "debug.h" #include "sockio.h" +#include "addfile.h" #include "hyper.h" #include "addfile.h" @@ -46,6 +47,10 @@ #include "all_hyper_proto.H1" +static int build_ht_filename(char*, char*, char*); +static int pathname(char*); +static int strpostfix(char*, char*); + char *gDatabasePath = NULL; diff --git a/src/hyper/addfile.h b/src/hyper/addfile.h deleted file mode 100644 index fd6a14e0..00000000 --- a/src/hyper/addfile.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd. - All rights reserved. - Copyright (C) 2007-2008, Gabriel Dos Reis. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - - Neither the name of The Numerical Algorithms Group Ltd. nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _ADDFILE_H_ -#define _ADDFILE_H_ 1 - -extern char *gDatabasePath; - -#endif diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c index 36595751..edc2add4 100644 --- a/src/hyper/htadd.c +++ b/src/hyper/htadd.c @@ -48,7 +48,7 @@ #include "lex.h" #include "htadd.H1" -#include "addfile.H1" +#include "addfile.h" #include "halloc.H1" #include "hash.H1" #include "hterror.H1" |