diff options
| author | Tim Prouty <tim.prouty@isilon.com> | 2008-04-29 14:36:24 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-05-20 22:40:13 +0200 |
| commit | fb37f156009611af0dd454a0fb0829a09cd638ac (patch) | |
| tree | e97403a13dd39b7ef485d36c6c7856045e6e4bf3 /source3/smbd/message.c | |
| parent | 6ed27edbcd3ba1893636a8072c8d7a621437daf7 (diff) | |
| download | samba-fb37f156009611af0dd454a0fb0829a09cd638ac.tar.gz | |
Cleanup size_t return values in callers of convert_string_allocate
This patch is the second iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 6b189dabc562d86dcaa685419d0cb6ea276f100d)
Diffstat (limited to 'source3/smbd/message.c')
| -rw-r--r-- | source3/smbd/message.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/smbd/message.c b/source3/smbd/message.c index a870f03df98..62df5c37ebf 100644 --- a/source3/smbd/message.c +++ b/source3/smbd/message.c @@ -45,7 +45,7 @@ static void msg_deliver(struct msg_state *state) int i; int fd; char *msg; - int len; + size_t len; ssize_t sz; fstring alpha_buf; char *s; @@ -72,18 +72,17 @@ static void msg_deliver(struct msg_state *state) * Incoming message is in DOS codepage format. Convert to UNIX. */ - len = convert_string_talloc( - talloc_tos(), CH_DOS, CH_UNIX, state->msg, - talloc_get_size(state->msg), (void *)&msg, true); - - if (len == -1) { + if (!convert_string_talloc(talloc_tos(), CH_DOS, CH_UNIX, state->msg, + talloc_get_size(state->msg), (void *)&msg, + &len, true)) { DEBUG(3, ("Conversion failed, delivering message in DOS " "codepage format\n")); msg = state->msg; } for (i = 0; i < len; i++) { - if ((msg[i] == '\r') && (i < (len-1)) && (msg[i+1] == '\n')) { + if ((msg[i] == '\r') && + (i < (len-1)) && (msg[i+1] == '\n')) { continue; } sz = write(fd, &msg[i], 1); |