diff options
| author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-10-06 20:03:57 +0400 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-10-06 20:03:57 +0400 |
| commit | 6b306ab8752befc28d259be55495f8249cc2df24 (patch) | |
| tree | 0fa3d471aef61925563709e0f8ee5667b57c7a9d /src/smtp_proto.c | |
| parent | 8d0053734fb5a4ccd8c3bda731e6b7c8261c6f67 (diff) | |
| download | rspamd-6b306ab8752befc28d259be55495f8249cc2df24.tar.gz rspamd-6b306ab8752befc28d259be55495f8249cc2df24.zip | |
Fixes types (use glib ones) no functional change.
Now all comments in commit logs beginning with '*' would be included in changelog, so
important changes would be separated from small ones.
Diffstat (limited to 'src/smtp_proto.c')
| -rw-r--r-- | src/smtp_proto.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/smtp_proto.c b/src/smtp_proto.c index dd1e6cbc3..dc8fccec1 100644 --- a/src/smtp_proto.c +++ b/src/smtp_proto.c @@ -29,11 +29,11 @@ #include "smtp.h" #include "smtp_proto.h" -char * -make_smtp_error (struct smtp_session *session, int error_code, const char *format, ...) +gchar * +make_smtp_error (struct smtp_session *session, gint error_code, const gchar *format, ...) { va_list vp; - char *result = NULL, *p; + gchar *result = NULL, *p; size_t len; va_start (vp, format); @@ -61,7 +61,7 @@ parse_smtp_command (struct smtp_session *session, f_str_t *line, struct smtp_com SMTP_PARSE_DONE } state; gchar *p, *c, ch, cmd_buf[4]; - int i; + gint i; f_str_t *arg = NULL; struct smtp_command *pcmd; @@ -144,7 +144,7 @@ parse_smtp_command (struct smtp_session *session, f_str_t *line, struct smtp_com } } else if ((ch < 'A' || ch > 'Z') && (ch < 'a' || ch > 'z')) { - msg_info ("invalid letter code in SMTP command: %d", (int)ch); + msg_info ("invalid letter code in SMTP command: %d", (gint)ch); return FALSE; } break; @@ -201,8 +201,8 @@ end: static gboolean check_smtp_path (f_str_t *path) { - int i; - char *p; + gint i; + gchar *p; p = path->begin; if (*p != '<' || path->len < 2) { @@ -328,10 +328,10 @@ parse_smtp_rcpt (struct smtp_session *session, struct smtp_command *cmd) } /* Return -1 if there are some error, 1 if all is ok and 0 in case of incomplete reply */ -static int -check_smtp_ustream_reply (f_str_t *in, char success_code) +static gint +check_smtp_ustream_reply (f_str_t *in, gchar success_code) { - char *p; + gchar *p; /* Check for 250 at the begin of line */ if (in->len >= sizeof ("220 ") - 1) { @@ -354,7 +354,7 @@ check_smtp_ustream_reply (f_str_t *in, char success_code) } size_t -smtp_upstream_write_list (GList *args, char *buf, size_t buflen) +smtp_upstream_write_list (GList *args, gchar *buf, size_t buflen) { GList *cur = args; size_t r = 0; @@ -390,8 +390,8 @@ gboolean smtp_upstream_read_socket (f_str_t * in, void *arg) { struct smtp_session *session = arg; - char outbuf[BUFSIZ]; - int r; + gchar outbuf[BUFSIZ]; + gint r; switch (session->upstream_state) { case SMTP_STATE_GREETING: |