Mercurial > hg > openttd
changeset 3457:e8fd835b8972 draft
(svn r4292) - CodeChange: sprinkle some holy water on l'ugly code (braces, and pos is PacketSize not int)
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Wed, 05 Apr 2006 20:12:54 +0000 |
parents | de3e234848a6 |
children | e5216c941d18 |
files | network_data.c |
diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/network_data.c +++ b/network_data.c @@ -270,24 +270,23 @@ } // Reads a string till it finds a '\0' in the stream -void NetworkRecv_string(NetworkClientState *cs, Packet *p, char* buffer, size_t size) +void NetworkRecv_string(NetworkClientState *cs, Packet *p, char *buffer, size_t size) { - int pos; + PacketSize pos; char *bufp = buffer; /* Don't allow reading from a closed socket */ - if (cs->quited) - return; + if (cs->quited) return; pos = p->pos; while (--size > 0 && pos < p->size && (*buffer++ = p->buffer[pos++]) != '\0') {} - if (size == 0 || pos == p->size) - { + + if (size == 0 || pos == p->size) { *buffer = '\0'; // If size was sooner to zero then the string in the stream // skip till the \0, so the packet can be read out correctly for the rest - while (pos < p->size && p->buffer[pos] != '\0') ++pos; - ++pos; + while (pos < p->size && p->buffer[pos] != '\0') pos++; + pos++; } p->pos = pos;