summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-22 23:25:44 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-22 23:25:44 +0000
commit22e62916d8c1a8633239c77bdd996490db869b50 (patch)
treef90b12307fcbc3de67e6f13c31ce53c27b22bb19 /source3
parent1ce67b7672ab58afd76d0ad9cc0343e688c6770d (diff)
downloadsamba-22e62916d8c1a8633239c77bdd996490db869b50.tar.gz
samba-22e62916d8c1a8633239c77bdd996490db869b50.tar.bz2
samba-22e62916d8c1a8633239c77bdd996490db869b50.zip
- Use FUNCTION_MACRO, not __FUNCTION__.
- Add some const (This used to be commit e149e70717f38e082ce35d55f9b4d84ba8419af7)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/getsmbpass.c2
-rw-r--r--source3/lib/util.c2
-rw-r--r--source3/sam/gumm_tdb.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/getsmbpass.c b/source3/lib/getsmbpass.c
index c271d55404..b6ae09b318 100644
--- a/source3/lib/getsmbpass.c
+++ b/source3/lib/getsmbpass.c
@@ -83,7 +83,7 @@ static int tcsetattr(int fd, int flags, struct sgttyb *t)
static struct termios t;
#endif /* SYSV_TERMIO */
-char *getsmbpass(char *prompt)
+char *getsmbpass(const char *prompt)
{
FILE *in, *out;
int echo_off;
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 4f564b332a..b67896c648 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1040,7 +1040,7 @@ BOOL get_mydomname(fstring my_domname)
Interpret a protocol description string, with a default.
****************************************************************************/
-int interpret_protocol(char *str,int def)
+int interpret_protocol(const char *str,int def)
{
if (strequal(str,"NT1"))
return(PROTOCOL_NT1);
diff --git a/source3/sam/gumm_tdb.c b/source3/sam/gumm_tdb.c
index 53ea872a11..5e390490cf 100644
--- a/source3/sam/gumm_tdb.c
+++ b/source3/sam/gumm_tdb.c
@@ -38,8 +38,8 @@ static int tdbgumm_debug_level = DBGC_ALL;
#define TDB_FORMAT_STRING "ddB"
-#define TALLOC_CHECK(ptr, err, label) do { if ((ptr) == NULL) { DEBUG(0, ("%s: Out of memory!\n", __FUNCTION__)); err = NT_STATUS_NO_MEMORY; goto label; } } while(0)
-#define SET_OR_FAIL(func, label) do { if (NT_STATUS_IS_ERR(func)) { DEBUG(0, ("%s: Setting gums object data failed!\n", __FUNCTION__)); goto label; } } while(0)
+#define TALLOC_CHECK(ptr, err, label) do { if ((ptr) == NULL) { DEBUG(0, ("%s: Out of memory!\n", FUNCTION_MACRO)); err = NT_STATUS_NO_MEMORY; goto label; } } while(0)
+#define SET_OR_FAIL(func, label) do { if (NT_STATUS_IS_ERR(func)) { DEBUG(0, ("%s: Setting gums object data failed!\n", FUNCTION_MACRO)); goto label; } } while(0)
struct tdbsam2_enum_objs {
uint32 type;