Remove NETnull() function, which was potentially confusing.

NETnull() was equivalent to uint32_t zero = 0; NETuint32_t(&zero);, which no longer adds/removes 4 bytes of padding as advertised.
Warzone2100 · Oct 23, 2010 · e8ebb11 · e8ebb11
1 parent db58c7c
commit e8ebb11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/lib/netplay/nettypes.cpp b/lib/netplay/nettypes.cpp
@@ -638,16 +638,6 @@ void NETbool(BOOL *bp)
 	*bp = !!i;
 }
 
-/*
- * NETnull should be used to either add 4 bytes of padding to a message, or to
- * discard 4 bytes of data from a message.
- */
-void NETnull()
-{
-	uint32_t zero = 0;
-	NETuint32_t(&zero);
-}
-
 /** Sends or receives a string to or from the current network package.
  *  \param str    When encoding a packet this is the (NUL-terminated string to
  *                be sent in the current network package. When decoding this

diff --git a/lib/netplay/nettypes.h b/lib/netplay/nettypes.h
@@ -93,7 +93,6 @@ void NETint64_t(int64_t *ip);
 void NETuint64_t(uint64_t *ip);
 void NETfloat(float* fp);
 void NETbool(BOOL *bp);
-void NETnull(void);
 void NETstring(char *str, uint16_t maxlen);
 void NETbin(uint8_t *str, uint32_t maxlen);
 

diff --git a/src/multistruct.c b/src/multistruct.c
@@ -84,7 +84,8 @@ BOOL sendBuildStarted(STRUCTURE *psStruct, DROID *psDroid)
 		}
 		else
 		{
-			NETnull();
+			uint32_t zero = 0;
+			NETuint32_t(&zero);
 		}
 
 	return NETend();