[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  24d4433... s3: Move "yesno" to the only place where it is used: client.c
      from  3d40d84... s3/doc: update vfs_shadow_copy2 man page according to new options

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 24d4433bd75366774945ed59c0043428dedea4ba
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jan 21 12:57:07 2010 +0100

    s3: Move "yesno" to the only place where it is used: client.c

-----------------------------------------------------------------------

Summary of changes:
 source3/client/client.c |   18 ++++++++++++++++++
 source3/include/proto.h |    1 -
 source3/lib/util.c      |   18 ------------------
 3 files changed, 18 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/client/client.c b/source3/client/client.c
index 504b1dd..f177129 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -163,6 +163,24 @@ const char *client_set_cur_dir(const char *newdir)
 }
 
 /****************************************************************************
+ Put up a yes/no prompt.
+****************************************************************************/
+
+static bool yesno(const char *p)
+{
+	char ans[20];
+	printf("%s",p);
+
+	if (!fgets(ans,sizeof(ans)-1,stdin))
+		return(False);
+
+	if (*ans == 'y' || *ans == 'Y')
+		return(True);
+
+	return(False);
+}
+
+/****************************************************************************
  Write to a local file with CR/LF->LF translation if appropriate. Return the
  number taken from the buffer. This may not equal the number written.
 ****************************************************************************/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8e8b35c..4d5ebca 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1140,7 +1140,6 @@ void smb_msleep(unsigned int t);
 NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
 		       struct event_context *ev_ctx,
 		       bool parent_longlived);
-bool yesno(const char *p);
 void *malloc_(size_t size);
 void *memalign_array(size_t el_size, size_t align, unsigned int count);
 void *calloc_array(size_t size, size_t nmemb);
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 8525d9c..007226b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -940,24 +940,6 @@ NTSTATUS reinit_after_fork(struct messaging_context *msg_ctx,
 	return status;
 }
 
-/****************************************************************************
- Put up a yes/no prompt.
-****************************************************************************/
-
-bool yesno(const char *p)
-{
-	char ans[20];
-	printf("%s",p);
-
-	if (!fgets(ans,sizeof(ans)-1,stdin))
-		return(False);
-
-	if (*ans == 'y' || *ans == 'Y')
-		return(True);
-
-	return(False);
-}
-
 #if defined(PARANOID_MALLOC_CHECKER)
 
 /****************************************************************************


-- 
Samba Shared Repository