- Make some string functions in g_cmds.c cleaner, by DevHC

- embed VM_FREEBUFFERS() macro in do-while-loop
This commit is contained in:
Thilo Schulz 2011-02-10 18:56:18 +00:00
parent 544a1c0c1a
commit e05c9ad1c2
4 changed files with 4 additions and 4 deletions

View file

@ -76,7 +76,7 @@ void DeathmatchScoreboardMessage( gentity_t *ent ) {
perfect,
cl->ps.persistant[PERS_CAPTURES]);
j = strlen(entry);
if (stringlength + j > 1024)
if (stringlength + j >= sizeof(string))
break;
strcpy (string + stringlength, entry);
stringlength += j;

View file

@ -1112,7 +1112,7 @@ void TeamplayInfoMessage( gentity_t *ent ) {
i, player->client->pers.teamState.location, h, a,
player->client->ps.weapon, player->s.powerups);
j = strlen(entry);
if (stringlength + j > sizeof(string))
if (stringlength + j >= sizeof(string))
break;
strcpy (string + stringlength, entry);
stringlength += j;

View file

@ -53,7 +53,7 @@ static void VM_Destroy_Compiled(vm_t* self);
*/
#define VMFREE_BUFFERS() {Z_Free(buf); Z_Free(jused);}
#define VMFREE_BUFFERS() do {Z_Free(buf); Z_Free(jused);} while(0)
static byte *buf = NULL;
static byte *jused = NULL;
static int compiledOfs = 0;

View file

@ -54,7 +54,7 @@ static FILE* qdasmout;
#define Dfprintf(args...)
#endif
#define VM_FREEBUFFERS(vm) {assembler_init(0); VM_Destroy_Compiled(vm);}
#define VM_FREEBUFFERS(vm) do {assembler_init(0); VM_Destroy_Compiled(vm);} while(0)
void assembler_set_output(char* buf);
size_t assembler_get_code_size(void);