[Stratagus-CVS] stratagus/src/network master.c

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/10/13 20:12:52

Modified files:
        src/network    : master.c 

Log message:
        Cleanup

Patches:
Index: stratagus/src/network/master.c
diff -u stratagus/src/network/master.c:1.12 stratagus/src/network/master.c:1.13
--- stratagus/src/network/master.c:1.12 Mon Oct 13 19:01:14 2003
+++ stratagus/src/network/master.c      Mon Oct 13 20:12:52 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: master.c,v 1.12 2003/10/13 23:01:14 mr-russ Exp $
+//     $Id: master.c,v 1.13 2003/10/14 00:12:52 jsalmon3 Exp $
 
 //@{
 
@@ -90,14 +90,14 @@
     reply = NULL;
     sockfd = NetworkFildes;
     for (i = 1234; i < 1244; ++i) {
-       sockfd=NetOpenTCP(i);   //FIXME: need to make a dynamic port allocation 
there...if (!sockfd) {...}
+       sockfd = NetOpenTCP(i); //FIXME: need to make a dynamic port allocation 
there...if (!sockfd) {...}
        if (sockfd != -1) {
            break;
        }
     }
     
     // FIXME: Configurable Meta Server
-    TCPConnectStatus = 
NetConnectTCP(sockfd,NetResolveHost(MASTER_HOST),MASTER_PORT);
+    TCPConnectStatus = NetConnectTCP(sockfd, NetResolveHost(MASTER_HOST), 
MASTER_PORT);
 
     if (TCPConnectStatus == -1) {
        //TODO: Notify player that connection was aborted...
@@ -140,7 +140,7 @@
 **
 **     @return 1 OK, 0 Error.
 */
-global int MetaServerOK(char **reply)
+global int MetaServerOK(char** reply)
 {
     return !strcmp("OK\r\n",*reply) || !strcmp("OK\n",*reply);
 }
@@ -163,7 +163,7 @@
     char* s;
     va_list ap;
 
-    size = strlen(GameName)+strlen(LocalPlayerName)+strlen(command)+100;
+    size = strlen(GameName) + strlen(LocalPlayerName) + strlen(command) + 100;
     ret = -1;
     if ((p = malloc(size)) == NULL) {
        return -1;
@@ -175,7 +175,7 @@
     // Message Structure
     // <Stratagus> if for Magnant Compatibility, it may be removed
     // Player Name, Game Name, VERSION, Command, **Paramaters**
-    sprintf(s,"<Stratagus>\n%s\n%s\n%s\n%s\n", LocalPlayerName, GameName, 
VERSION, command);
+    sprintf(s, "<Stratagus>\n%s\n%s\n%s\n%s\n", LocalPlayerName, GameName, 
VERSION, command);
 
     // Commands
     // Login - password
@@ -210,8 +210,8 @@
     }
     // Allocate the correct size
     if ((s = realloc(s, size + strlen(s))) == NULL ) {
-           free(p);
-           return -1;
+       free(p);
+       return -1;
     }
     strcat(s, p);
     size = strlen(s);
@@ -227,7 +227,7 @@
 **     @param  reply   Text of the reply
 **     @return error or number of bytes
 */
-global int RecvMetaReply(char **reply)
+global int RecvMetaReply(char** reply)
 {
     int n;
     int size;
@@ -238,7 +238,8 @@
        return -1;
     }
    
-    size=1;
+    size = 1;
+    p = NULL;
     while ((n = NetRecvTCP(sockfd, &buf, 1024))) {
        size += n;
        if ((p = realloc(p, size)) == NULL) {