From e9ed6761b87c2b8fe1e86944f188037fc404d568 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Tue, 29 Aug 2000 17:59:17 +0000 Subject: [PATCH] renamed getmode() and setmode() to get_mode() and set_mode() to avoid a collision with Mac OS X file permission bits manipulation functions of the same name which get included through unistd.h git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12633 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/gssftp/ftp/ChangeLog | 7 +++++++ src/appl/gssftp/ftp/cmds.c | 8 ++++---- src/appl/gssftp/ftp/cmdtab.c | 2 +- src/appl/gssftp/ftp/ftp_var.h | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index f319027d7..2424554f2 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,10 @@ +2000-08-29 Alexandra Ellwood + + * cmds.c, cmdtab.c, ftp_var.h: renamed getmode() and setmode() + to get_mode() and set_mode() to avoid a collision with Mac OS X + file permission bits manipulation functions of the same name + which get included through unistd.h. + Tue Aug 22 17:10:39 2000 Ezra Peisach * secure.h (myaddr): For secure data stream, pass the port number diff --git a/src/appl/gssftp/ftp/cmds.c b/src/appl/gssftp/ftp/cmds.c index ca354be31..d22bb71e5 100644 --- a/src/appl/gssftp/ftp/cmds.c +++ b/src/appl/gssftp/ftp/cmds.c @@ -588,7 +588,7 @@ void settenex() } static char * -getmode() +get_mode() { return("stream"); } @@ -597,12 +597,12 @@ getmode() * Set file transfer mode. */ /*ARGSUSED*/ -void setmode(argc, argv) +void set_mode(argc, argv) int argc; char *argv[]; { - printf("We only support %s mode, sorry.\n", getmode()); + printf("We only support %s mode, sorry.\n", get_mode()); code = -1; } @@ -1114,7 +1114,7 @@ static void cstatus() printf("Data Channel Protection Level: %s\n", getdlevel()); printf("Passive mode %s\n", onoff(passivemode)); printf("Mode: %s; Type: %s; Form: %s; Structure: %s\n", - getmode(), gettype(), getform(), getstruct()); + get_mode(), gettype(), getform(), getstruct()); printf("Store unique: %s; Receive unique: %s\n", onoff(sunique), onoff(runique)); printf("Case: %s; CR stripping: %s\n",onoff(mcase),onoff(crflag)); diff --git a/src/appl/gssftp/ftp/cmdtab.c b/src/appl/gssftp/ftp/cmdtab.c index 77511cb97..cfa11e371 100644 --- a/src/appl/gssftp/ftp/cmdtab.c +++ b/src/appl/gssftp/ftp/cmdtab.c @@ -156,7 +156,7 @@ struct cmd cmdtab[] = { { "mget", mgethelp, 1, 1, 1, mget }, { "mkdir", mkdirhelp, 0, 1, 1, makedir }, { "mls", mlshelp, 1, 1, 1, mls }, - { "mode", modehelp, 0, 1, 1, setmode }, + { "mode", modehelp, 0, 1, 1, set_mode }, { "modtime", modtimehelp, 0, 1, 1, modtime }, { "mput", mputhelp, 1, 1, 1, mput }, { "newer", newerhelp, 1, 1, 1, newer }, diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h index cc0080b1b..99c5ea0b6 100644 --- a/src/appl/gssftp/ftp/ftp_var.h +++ b/src/appl/gssftp/ftp/ftp_var.h @@ -162,7 +162,7 @@ void changetype PROTOTYPE((int, int)); void setbinary PROTOTYPE((void)); void setascii PROTOTYPE((void)); void settenex PROTOTYPE((void)); -void setmode PROTOTYPE((int, char **)); +void set_mode PROTOTYPE((int, char **)); void setform PROTOTYPE((int, char **)); void setstruct PROTOTYPE((int, char **)); void siteidle PROTOTYPE((int, char **)); -- 2.26.2