development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-16 10:38:05 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Rename imap-send's internal info/warn functions.

Browse source 
Because I am about to introduce a global warn() function (much
like the global error function) this global declaration would
conflict with the one supplied by imap-send.  Further since
imap-send's warn function output depends on its Quiet setting
we cannot simply remove its internal definition and use the
forthcoming global one.

So refactor warn() -> imap_warn() and info() -> imap_info()
(the latter was done just to be consistent in naming).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2006-12-21 19:48:12 -05:00 committed by Junio C Hamano
parent a01c9c28a5
commit 51dcaa9686
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
imap-send.c
View file

@ -96,8 +96,8 @@ typedef struct {
static int Verbose, Quiet;
static void info( const char *, ... );
static void warn( const char *, ... );
static void imap_info( const char *, ... );
static void imap_warn( const char *, ... );
static char *next_arg( char ** );
@ -297,7 +297,7 @@ buffer_gets( buffer_t * b, char **s )
}
static void
info( const char *msg, ... )
imap_info( const char *msg, ... )
{
va_list va;
@ -310,7 +310,7 @@ info( const char *msg, ... )
}
static void
warn( const char *msg, ... )
imap_warn( const char *msg, ... )
{
va_list va;
@ -903,7 +903,7 @@ imap_open_store( imap_server_conf_t *srvc )
/* open connection to IMAP server */
if (srvc->tunnel) {
info( "Starting tunnel '%s'... ", srvc->tunnel );
imap_info( "Starting tunnel '%s'... ", srvc->tunnel );
if (socketpair( PF_UNIX, SOCK_STREAM, 0, a )) {
perror( "socketpair" );
@ -926,31 +926,31 @@ imap_open_store( imap_server_conf_t *srvc )
imap->buf.sock.fd = a[1];
info( "ok\n" );
imap_info( "ok\n" );
} else {
memset( &addr, 0, sizeof(addr) );
addr.sin_port = htons( srvc->port );
addr.sin_family = AF_INET;
info( "Resolving %s... ", srvc->host );
imap_info( "Resolving %s... ", srvc->host );
he = gethostbyname( srvc->host );
if (!he) {
perror( "gethostbyname" );
goto bail;
}
info( "ok\n" );
imap_info( "ok\n" );
addr.sin_addr.s_addr = *((int *) he->h_addr_list[0]);
s = socket( PF_INET, SOCK_STREAM, 0 );
info( "Connecting to %s:%hu... ", inet_ntoa( addr.sin_addr ), ntohs( addr.sin_port ) );
imap_info( "Connecting to %s:%hu... ", inet_ntoa( addr.sin_addr ), ntohs( addr.sin_port ) );
if (connect( s, (struct sockaddr *)&addr, sizeof(addr) )) {
close( s );
perror( "connect" );
goto bail;
}
info( "ok\n" );
imap_info( "ok\n" );
imap->buf.sock.fd = s;
@ -979,7 +979,7 @@ imap_open_store( imap_server_conf_t *srvc )
if (!preauth) {
info ("Logging in...\n");
imap_info ("Logging in...\n");
if (!srvc->user) {
fprintf( stderr, "Skipping server %s, no user\n", srvc->host );
goto bail;
@ -1006,7 +1006,7 @@ imap_open_store( imap_server_conf_t *srvc )
fprintf( stderr, "Skipping account %s@%s, server forbids LOGIN\n", srvc->user, srvc->host );
goto bail;
}
warn( "*** IMAP Warning *** Password is being sent in the clear\n" );
imap_warn( "*** IMAP Warning *** Password is being sent in the clear\n" );
if (imap_exec( ctx, NULL, "LOGIN \"%s\" \"%s\"", srvc->user, srvc->pass ) != RESP_OK) {
fprintf( stderr, "IMAP error: LOGIN failed\n" );
goto bail;