From: Julien Danjou Date: Fri, 17 Nov 2006 17:17:11 +0000 (+0100) Subject: Rename pop_query_d to pop_query and remove useless arg X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=d63fe782146b7e2860d45fd6c2cf5369d9b0a87a Rename pop_query_d to pop_query and remove useless arg Signed-off-by: Julien Danjou Signed-off-by: Pierre Habouzit --- diff --git a/pop/pop.h b/pop/pop.h index 3d3f4b5..6e857c0 100644 --- a/pop/pop.h +++ b/pop/pop.h @@ -92,11 +92,10 @@ int pop_authenticate (POP_DATA *); void pop_apop_timestamp (POP_DATA *, char *); /* pop_lib.c */ -#define pop_query(A,B,C) pop_query_d(A,B,C,NULL) int pop_parse_path (const char *, ACCOUNT *); int pop_connect (POP_DATA *); pop_query_status pop_open_connection (POP_DATA *); -pop_query_status pop_query_d (POP_DATA *, char *, size_t, const char *); +pop_query_status pop_query (POP_DATA *, char *, size_t); pop_query_status pop_fetch_data (POP_DATA *, const char *, progress_t*, int (*funct) (char *, void *), void *); pop_query_status pop_reconnect (CONTEXT *); diff --git a/pop/pop_auth.c b/pop/pop_auth.c index 2743910..d17d52f 100644 --- a/pop/pop_auth.c +++ b/pop/pop_auth.c @@ -232,7 +232,7 @@ static pop_auth_res_t pop_auth_user (POP_DATA * pop_data, if (ret == PQ_OK) { snprintf (buf, sizeof (buf), "PASS %s\r\n", pop_data->conn->account.pass); - ret = pop_query_d (pop_data, buf, sizeof (buf), NULL); + ret = pop_query (pop_data, buf, sizeof (buf)); } switch (ret) { diff --git a/pop/pop_lib.c b/pop/pop_lib.c index 02c8060..a96a01c 100644 --- a/pop/pop_lib.c +++ b/pop/pop_lib.c @@ -368,7 +368,7 @@ void pop_logout (CONTEXT * ctx) * -1 - conection lost, * -2 - invalid command or execution error. */ -pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, const char *msg) +pop_query_status pop_query (POP_DATA * pop_data, char *buf, size_t buflen) { char *c;