diff options
author | Rich Megginson <rmeggins@redhat.com> | 2005-02-24 21:47:07 +0000 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2005-02-24 21:47:07 +0000 |
commit | 6703f63899ba102659292134a5abccc690fecae6 (patch) | |
tree | 86909fa808fb8c0cd38046d4b0bc20c1806e9c09 /include | |
parent | 370d483a51167d5b9e7cf936a03f3bb42cae5cd4 (diff) | |
download | ds-6703f63899ba102659292134a5abccc690fecae6.tar.gz ds-6703f63899ba102659292134a5abccc690fecae6.tar.xz ds-6703f63899ba102659292134a5abccc690fecae6.zip |
get rid of adminutil dependency on core DS
Diffstat (limited to 'include')
-rw-r--r-- | include/i18n.h | 115 | ||||
-rw-r--r-- | include/libadmin/libadmin.h | 8 | ||||
-rw-r--r-- | include/nt/nsapi.h | 106 | ||||
-rw-r--r-- | include/public/nsapi.h | 6 |
4 files changed, 86 insertions, 149 deletions
diff --git a/include/i18n.h b/include/i18n.h index 1a6e67c4..f6741c6a 100644 --- a/include/i18n.h +++ b/include/i18n.h @@ -9,11 +9,91 @@ /* Make NSAPI_PUBLIC available */ #include "base/systems.h" -#include "libadminutil/resource.h" + +/* This stuff was copied from libadminutil/resource.h so we could + remove the dependency on adminutil which is not being open sourced + this first round. +*/ +#ifndef COPIED_FROM_LIBADMINUTIL_RESOURCE_H +/* Resource contains the name of the + property file w/ paht information +*/ +typedef struct +{ + char *path; + char *package; + void *propset; +} Resource; + +/*******************************************************************************/ +/* + * this table contains library name + * (stored in the first string entry, with id=0), + * and the id/string pairs which are used by library + */ + +typedef struct res_RESOURCE_TABLE +{ + int id; + char *str; +} res_RESOURCE_TABLE; + +/*******************************************************************************/ + +/* + * resource global contains resource table list which is used + * to generate the database. + * Also used for "in memory" version of XP_GetStringFromDatabase() + */ + +typedef struct res_RESOURCE_GLOBAL +{ + res_RESOURCE_TABLE *restable; +} res_RESOURCE_GLOBAL; + +/*******************************************************************************/ + +/* + * Define the ResDef macro to simplify the maintenance of strings which are to + * be added to the library or application header file (dbtxxx.h). This enables + * source code to refer to the strings by theit TokenNames, and allows the + * strings to be stored in the database. + * + * Usage: ResDef(TokenName,TokenValue,String) + * + * Example: ResDef(DBT_HelloWorld_, \ + * 1,"Hello, World!") + * ResDef(DBT_TheCowJumpedOverTheMoon_, \ + * 2,"The cow jumped over the moon.") + * ResDef(DBT_TheValueOfPiIsAbout31415926536_, \ + * 3,"The value of PI is about 3.1415926536." + * + * RESOURCE_STR is used by makstrdb.c only. It is not used by getstrdb.c or + * in library or application source code. + */ + +#ifdef RESOURCE_STR +#define BEGIN_STR(argLibraryName) \ + RESOURCE_TABLE argLibraryName[] = { 0, #argLibraryName, +#define ResDef(argToken,argID,argString) \ + argID, argString, +#define END_STR(argLibraryName) \ + 0, 0 }; +#else +#define BEGIN_STR(argLibraryName) \ + enum { +#define ResDef(argToken,argID,argString) \ + argToken = argID, +#define END_STR(argLibraryName) \ + argLibraryName ## top }; +#endif + +#endif /* COPIED_FROM_LIBADMINUTIL_RESOURCE_H */ typedef res_RESOURCE_TABLE RESOURCE_TABLE; typedef res_RESOURCE_GLOBAL RESOURCE_GLOBAL; + /*******************************************************************************/ /* @@ -209,37 +289,4 @@ extern void XP_PrintStringDatabase(void); /*******************************************************************************/ - -/*******************************************************************************/ - -/* - * Define the ResDef macro to simplify the maintenance of strings which are to - * be added to the library or application header file (dbtxxx.h). This enables - * source code to refer to the strings by theit TokenNames, and allows the - * strings to be stored in the database. - * - * Usage: ResDef(TokenName,TokenValue,String) - * - * Example: ResDef(DBT_HelloWorld_, \ - * 1,"Hello, World!") - * ResDef(DBT_TheCowJumpedOverTheMoon_, \ - * 2,"The cow jumped over the moon.") - * ResDef(DBT_TheValueOfPiIsAbout31415926536_, \ - * 3,"The value of PI is about 3.1415926536." - * - * RESOURCE_STR is used by makstrdb.c only. It is not used by getstrdb.c or - * in library or application source code. - */ - -#if 0 -#define BEGIN_STR(argLibraryName) \ - enum { -#define ResDef(argToken,argID,argString) \ - argToken = argID, -#define END_STR(argLibraryName) \ - argLibraryName ## top }; - -#endif -/*******************************************************************************/ - #endif diff --git a/include/libadmin/libadmin.h b/include/libadmin/libadmin.h index 713fa663..c2facb88 100644 --- a/include/libadmin/libadmin.h +++ b/include/libadmin/libadmin.h @@ -85,14 +85,6 @@ NSAPI_PUBLIC char *alert_word_wrap(char *str, int width, char *linefeed); /* util.c */ NSAPI_PUBLIC char *get_userdb_dir(void); -/* Maintain what amounts to a handle to a list of strings */ -/* strlist.c */ -/* Moved to libadminutil, use libadminutil/admutil.h instead -NSAPI_PUBLIC char **new_strlist(int size); -NSAPI_PUBLIC char **grow_strlist(char **strlist, int newsize); -NSAPI_PUBLIC void free_strlist(char **strlist); -*/ - NSAPI_PUBLIC char *cookieValue( char *, char * ); NSPR_END_EXTERN_C diff --git a/include/nt/nsapi.h b/include/nt/nsapi.h deleted file mode 100644 index 82c46bb7..00000000 --- a/include/nt/nsapi.h +++ /dev/null @@ -1,106 +0,0 @@ -/** BEGIN COPYRIGHT BLOCK - * Copyright 2001 Sun Microsystems, Inc. - * Portions copyright 1999, 2001-2003 Netscape Communications Corporation. - * All rights reserved. - * END COPYRIGHT BLOCK **/ -/*
- * Aruna Victor
- */
-
-#include <windows.h>
-#include <stdio.h>
-
-#include <base/file.h>
-#include <base/eventlog.h>
-#include <base/util.h>
-#include <base/shexp.h>
-#include <base/systhr.h>
-#include <base/crit.h>
-#include <base/systhr.h>
-
-#include <ssl.h>
-typedef void * (SafFunction)();
-SafFunction **SafTable;
-__declspec(dllexport) int InitSafTable(SafFunction *Table);
-
-/* Functions from file.h */
-#define SYSTEM_FOPENRO 22
-#define SYSTEM_FOPENWA 23
-#define SYSTEM_FOPENRW 24
-#define SYSTEM_FCLOSE 25
-#define SYSTEM_NOCOREDUMPS 26
-#define SYSTEM_FWRITE 27
-#define SYSTEM_FWRITE_ATOMIC 28
-#define SYSTEM_WINERR 29
-#define SYSTEM_WINSOCKERR 30
-#define FILE_NOTFOUND 31
-#define SYSTEM_STAT 32
-
-#define FILE_UNIX2LOCAL 34
-#define DIR_OPEN 35
-#define DIR_READ 36
-#define DIR_CLOSE 37
-
-/* Functions from ereport.h */
-#define EREPORT 80
-
-/* Functions from minissl.h */
-#define SSL_CLOSE 90
-#define SSL_SOCKET 91
-#define SSL_GET_SOCKOPT 92
-#define SSL_SET_SOCKOPT 93
-#define SSL_BIND 94
-#define SSL_LISTEN 95
-#define SSL_ACCEPT 96
-#define SSL_READ 97
-#define SSL_WRITE 98
-#define SSL_GETPEERNAME 99
-
-/* Functions from systhr.h */
-#define SYSTHREAD_START 133
-#define SYSTHREAD_ATTACH 134
-#define SYSTHREAD_TERMINATE 135
-#define SYSTHREAD_SLEEP 136
-#define SYSTHREAD_INIT 137
-#define SYSTHREAD_NEWKEY 138
-#define SYSTHREAD_GETDATA 139
-#define SYSTHREAD_SETDATA 140
-
-#define LOG_ERROR_EVENT 149
-
-/* Functions from shexp.h */
-#define SHEXP_VALID 160
-#define SHEXP_MATCH 161
-#define SHEXP_CMP 162
-#define SHEXP_CASECMP 163
-
-/* Functions from systems.h */
-#define UTIL_STRCASECMP 170
-#define UTIL_STRNCASECMP 171
-
-/* Functions from util.h */
-#define UTIL_HOSTNAME 187
-#define UTIL_ITOA 198
-#define UTIL_VSPRINTF 199
-#define UTIL_SPRINTF 200
-#define UTIL_VSNPRINTF 201
-#define UTIL_SNPRINTF 202
-
-/* Functions from conf.h */
-#define CONF_INIT 207
-
-/* robm Functions added in 2.0 */
-#define SYSTEM_FOPENWT 261
-#define SYSTEM_MALLOC 262
-#define SYSTEM_FREE 263
-#define SYSTEM_REALLOC 264
-#define SYSTEM_STRDUP 265
-
-#define CRIT_INIT 267
-#define CRIT_ENTER 268
-#define CRIT_EXIT 269
-#define CRIT_TERMINATE 270
-#define SYSTHREAD_CURRENT 271
- -#define ACL_LISTCONCAT 312
-#define GETCLIENTLANG 313
diff --git a/include/public/nsapi.h b/include/public/nsapi.h index ef01aaad..ed3c536a 100644 --- a/include/public/nsapi.h +++ b/include/public/nsapi.h @@ -173,7 +173,11 @@ struct iovec { #include <dirent.h> #include <pwd.h> /* struct passwd */ #endif /* XP_UNIX */ -#include "libadminutil/psetc.h" + +#ifndef BIG_LINE +#define BIG_LINE 1024 +#endif + /* --- End native platform includes --- */ |