tyler.durden
/
dgamelaunch
mirror of https://github.com/paxed/dgamelaunch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use an ARRAY_SIZE macro if available, if not, #define it 

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@49 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-01-03 02:10:35 +00:00
parent 1653b2ef8e
commit f49aa0e0ef
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dgamelaunch.c
View File

@ -58,6 +58,11 @@
#ifdef __linux__ #ifdef __linux__
# include <pty.h> # include <pty.h>
# include <libiberty.h>
#endif
#ifndef ARRAY_SIZE
# define ARRAY_SIZE(x) sizeof(x) / sizeof(x[0])
#endif #endif
#include <grp.h> #include <grp.h>
@ -207,7 +212,7 @@ loadbanner (struct dg_banner *ban)
{ {
strncat (bufnew, VERSION, 80 - i); strncat (bufnew, VERSION, 80 - i);
b += 8; /* skip the whole $VERSION string */ b += 8; /* skip the whole $VERSION string */
i += sizeof (VERSION) / sizeof (VERSION[0]); i += ARRAY_SIZE(VERSION);
} }
if (strlen (b) == 0) if (strlen (b) == 0)
@ -484,9 +489,7 @@ domailuser (char *username)
assert (loggedin); assert (loggedin);
len = len = ARRAY_SIZE(LOC_SPOOLDIR) + strlen (username) + 1;
(sizeof (LOC_SPOOLDIR) / sizeof (LOC_SPOOLDIR[0])) + strlen (username) +
1;
spool_fn = malloc (len + 1); spool_fn = malloc (len + 1);
time (&now); time (&now);
snprintf (spool_fn, len, "%s/%s", LOC_SPOOLDIR, username); snprintf (spool_fn, len, "%s/%s", LOC_SPOOLDIR, username);
@ -1153,9 +1156,7 @@ main (void)
/* environment */ /* environment */
snprintf (atrcfilename, 81, "@%s", rcfilename); snprintf (atrcfilename, 81, "@%s", rcfilename);
len = len = ARRAY_SIZE(LOC_SPOOLDIR) + strlen (me->username) + 1;
(sizeof (LOC_SPOOLDIR) / sizeof (LOC_SPOOLDIR[0])) +
strlen (me->username) + 1;
spool = malloc (len + 1); spool = malloc (len + 1);
snprintf (spool, len, "%s/%s", LOC_SPOOLDIR, me->username); snprintf (spool, len, "%s/%s", LOC_SPOOLDIR, me->username);