Author: jelmer Date: 2005-09-19 12:58:43 +0000 (Mon, 19 Sep 2005) New Revision: 10315
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10315 Log: Remove use of fstring and pstring in dynconfig.c Remove unused includes of dynconfig.h Modified: branches/SAMBA_4_0/source/client/client.c branches/SAMBA_4_0/source/dynconfig.c branches/SAMBA_4_0/source/include/dynconfig.h branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c branches/SAMBA_4_0/source/lib/util.c branches/SAMBA_4_0/source/smbd/server.c branches/SAMBA_4_0/source/torture/gentest.c branches/SAMBA_4_0/source/torture/locktest.c branches/SAMBA_4_0/source/torture/masktest.c branches/SAMBA_4_0/source/torture/torture.c branches/SAMBA_4_0/source/utils/nmblookup.c branches/SAMBA_4_0/source/utils/ntlm_auth.c Changeset: Modified: branches/SAMBA_4_0/source/client/client.c =================================================================== --- branches/SAMBA_4_0/source/client/client.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/client/client.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -23,7 +23,6 @@ #include "includes.h" #include "version.h" -#include "dynconfig.h" #include "clilist.h" #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/ndr_srvsvc.h" Modified: branches/SAMBA_4_0/source/dynconfig.c =================================================================== --- branches/SAMBA_4_0/source/dynconfig.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/dynconfig.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -44,7 +44,7 @@ const char *dyn_SBINDIR = SBINDIR, *dyn_BINDIR = BINDIR; -pstring dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/ +const char *dyn_CONFIGFILE = CONFIGFILE; /**< Location of smb.conf file. **/ /** Log file directory. **/ const char *dyn_LOGFILEBASE = LOGFILEBASE; @@ -52,24 +52,24 @@ const char *dyn_NCALRPCDIR = NCALRPCDIR; /** Statically configured LanMan hosts. **/ -pstring dyn_LMHOSTSFILE = LMHOSTSFILE; +const char *dyn_LMHOSTSFILE = LMHOSTSFILE; /** * @brief Samba library directory. * * @sa lib_path() to get the path to a file inside the LIBDIR. **/ -pstring dyn_LIBDIR = LIBDIR; -const fstring dyn_SHLIBEXT = SHLIBEXT; +const char *dyn_LIBDIR = LIBDIR; +const char *dyn_SHLIBEXT = SHLIBEXT; /** * @brief Directory holding lock files. * * Not writable, but used to set a default in the parameter table. **/ -const pstring dyn_LOCKDIR = LOCKDIR; -const pstring dyn_PIDDIR = PIDDIR; +const char *dyn_LOCKDIR = LOCKDIR; +const char *dyn_PIDDIR = PIDDIR; -const pstring dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE; -const pstring dyn_PRIVATE_DIR = PRIVATE_DIR; -const pstring dyn_SWATDIR = SWATDIR; +const char *dyn_SMB_PASSWD_FILE = SMB_PASSWD_FILE; +const char *dyn_PRIVATE_DIR = PRIVATE_DIR; +const char *dyn_SWATDIR = SWATDIR; Modified: branches/SAMBA_4_0/source/include/dynconfig.h =================================================================== --- branches/SAMBA_4_0/source/include/dynconfig.h 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/include/dynconfig.h 2005-09-19 12:58:43 UTC (rev 10315) @@ -25,19 +25,15 @@ * @brief Exported global configurations. **/ -#include "pstring.h" - -extern char const *dyn_SBINDIR, - *dyn_BINDIR; - -extern pstring dyn_CONFIGFILE; +extern const char *dyn_SBINDIR, *dyn_BINDIR; +extern const char *dyn_CONFIGFILE; extern const char *dyn_NCALRPCDIR; extern const char *dyn_LOGFILEBASE; -extern pstring dyn_LMHOSTSFILE; -extern pstring dyn_LIBDIR; -extern const fstring dyn_SHLIBEXT; -extern const pstring dyn_LOCKDIR; -extern const pstring dyn_PIDDIR; -extern const pstring dyn_SMB_PASSWD_FILE; -extern const pstring dyn_PRIVATE_DIR; -extern const pstring dyn_SWATDIR; +extern const char *dyn_LMHOSTSFILE; +extern const char *dyn_LIBDIR; +extern const char *dyn_SHLIBEXT; +extern const char *dyn_LOCKDIR; +extern const char *dyn_PIDDIR; +extern const char *dyn_SMB_PASSWD_FILE; +extern const char *dyn_PRIVATE_DIR; +extern const char *dyn_SWATDIR; Modified: branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c =================================================================== --- branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/ldap_server/ldap_hacked_ldb.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -22,7 +22,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "ldap_server/ldap_server.h" #include "lib/ldb/include/ldb.h" #include "librpc/gen_ndr/ndr_security.h" Modified: branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c =================================================================== --- branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -19,7 +19,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "ldap_server/ldap_server.h" #include "system/time.h" #include "lib/ldb/include/ldb.h" Modified: branches/SAMBA_4_0/source/lib/util.c =================================================================== --- branches/SAMBA_4_0/source/lib/util.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/lib/util.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -703,18 +703,6 @@ return fname; } -/** - * @brief Returns the platform specific shared library extension. - * - * @retval Pointer to a static #fstring containing the extension. - **/ - -const char *shlib_ext(void) -{ - return dyn_SHLIBEXT; -} - - void dump_data_pw(const char *msg, const uint8_t * data, size_t len) { #ifdef DEBUG_PASSWORD Modified: branches/SAMBA_4_0/source/smbd/server.c =================================================================== --- branches/SAMBA_4_0/source/smbd/server.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/smbd/server.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -26,7 +26,6 @@ #include "includes.h" #include "lib/events/events.h" #include "version.h" -#include "dynconfig.h" #include "lib/cmdline/popt_common.h" #include "system/dir.h" #include "system/filesys.h" Modified: branches/SAMBA_4_0/source/torture/gentest.c =================================================================== --- branches/SAMBA_4_0/source/torture/gentest.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/torture/gentest.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -19,7 +19,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "system/time.h" #include "system/filesys.h" #include "request.h" Modified: branches/SAMBA_4_0/source/torture/locktest.c =================================================================== --- branches/SAMBA_4_0/source/torture/locktest.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/torture/locktest.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -20,8 +20,8 @@ #include "includes.h" #include "system/filesys.h" -#include "dynconfig.h" #include "system/time.h" +#include "pstring.h" static int numops = 1000; static BOOL showall; Modified: branches/SAMBA_4_0/source/torture/masktest.c =================================================================== --- branches/SAMBA_4_0/source/torture/masktest.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/torture/masktest.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -20,10 +20,10 @@ #include "includes.h" #include "system/filesys.h" -#include "dynconfig.h" #include "clilist.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" +#include "pstring.h" static struct cli_credentials *credentials; static BOOL showall = False; Modified: branches/SAMBA_4_0/source/torture/torture.c =================================================================== --- branches/SAMBA_4_0/source/torture/torture.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/torture/torture.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -19,7 +19,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "clilist.h" #include "lib/cmdline/popt_common.h" #include "libcli/raw/libcliraw.h" Modified: branches/SAMBA_4_0/source/utils/nmblookup.c =================================================================== --- branches/SAMBA_4_0/source/utils/nmblookup.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/utils/nmblookup.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -23,7 +23,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "libcli/nbt/libnbt.h" #include "lib/cmdline/popt_common.h" #include "system/iconv.h" Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c =================================================================== --- branches/SAMBA_4_0/source/utils/ntlm_auth.c 2005-09-19 11:55:34 UTC (rev 10314) +++ branches/SAMBA_4_0/source/utils/ntlm_auth.c 2005-09-19 12:58:43 UTC (rev 10315) @@ -23,7 +23,6 @@ */ #include "includes.h" -#include "dynconfig.h" #include "system/filesys.h" #include "system/passwd.h" #include "lib/cmdline/popt_common.h"
