From 256ced029c235687bfafdffd07be7d47bf7af39b Mon Sep 17 00:00:00 2001 From: David Lichteblau Date: Thu, 18 Jun 2009 20:07:42 +0200 Subject: [PATCH 10/15] renamed getline --- ldapvi/common.h | 2 +- ldapvi/ldapvi.c | 2 +- ldapvi/misc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ldapvi/common.h b/ldapvi/common.h index 4c264e8..f731e62 100644 --- a/ldapvi/common.h +++ b/ldapvi/common.h @@ -273,7 +273,7 @@ void pipeview_wait(int pid); char *home_filename(char *name); void read_ldapvi_history(void); void write_ldapvi_history(void); -char *getline(char *prompt, char *value); +char *ldapvi_getline(char *prompt, char *value); char *get_password(); char *append(char *a, char *b); void *xalloc(size_t size); diff --git a/ldapvi/ldapvi.c b/ldapvi/ldapvi.c index 9d7d77c..7b312f8 100644 --- a/ldapvi/ldapvi.c +++ b/ldapvi/ldapvi.c @@ -470,7 +470,7 @@ change_mechanism(bind_options *bo) bo->authmethod = LDAP_AUTH_SASL; puts("Switching to SASL authentication."); } - bo->sasl_mech = getline("SASL mechanism", bo->sasl_mech); + bo->sasl_mech = ldapvi_getline("SASL mechanism", bo->sasl_mech); } static int diff --git a/ldapvi/misc.c b/ldapvi/misc.c index 0a9dba9..3b6896e 100644 --- a/ldapvi/misc.c +++ b/ldapvi/misc.c @@ -315,7 +315,7 @@ write_ldapvi_history() } char * -getline(char *prompt, char *value) +ldapvi_getline(char *prompt, char *value) { tdialog d; init_dialog(&d, DIALOG_DEFAULT, prompt, value); -- 2.8.1