summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2015-03-21 10:08:25 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2015-04-21 16:57:08 -0700
commitdf4e41fdb47cdeab5155224557ed8ab4ec4dc659 (patch)
tree3497c79b303998d2480f9875b65af72cffc321dd
parentae75d50395fdd7a6bc382ba73e923c460764c702 (diff)
Convert os/* to new *allocarray functions
v2: remove now useless parentheses Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--os/connection.c13
-rw-r--r--os/utils.c2
2 files changed, 8 insertions, 7 deletions
diff --git a/os/connection.c b/os/connection.c
index 7ff44e175..c36b125fe 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -309,7 +309,7 @@ InitConnectionLimits(void)
#if !defined(WIN32)
if (!ConnectionTranslation)
- ConnectionTranslation = (int *) xnfalloc(sizeof(int) * (lastfdesc + 1));
+ ConnectionTranslation = xnfallocarray(lastfdesc + 1, sizeof(int));
#else
InitConnectionTranslation();
#endif
@@ -429,7 +429,9 @@ CreateWellKnownSockets(void)
display = dynamic_display;
}
- ListenTransFds = malloc(ListenTransCount * sizeof (int));
+ ListenTransFds = xallocarray(ListenTransCount, sizeof (int));
+ if (ListenTransFds == NULL)
+ FatalError ("Failed to create listening socket array");
for (i = 0; i < ListenTransCount; i++) {
int fd = _XSERVTransGetConnectionNumber(ListenTransConns[i]);
@@ -1291,11 +1293,10 @@ ListenOnOpenFD(int fd, int noxauth)
/* Allocate space to store it */
ListenTransFds =
- (int *) realloc(ListenTransFds, (ListenTransCount + 1) * sizeof(int));
+ xnfreallocarray(ListenTransFds, ListenTransCount + 1, sizeof(int));
ListenTransConns =
- (XtransConnInfo *) realloc(ListenTransConns,
- (ListenTransCount +
- 1) * sizeof(XtransConnInfo));
+ xnfreallocarray(ListenTransConns, ListenTransCount + 1,
+ sizeof(XtransConnInfo));
/* Store it */
ListenTransConns[ListenTransCount] = ciptr;
diff --git a/os/utils.c b/os/utils.c
index 23f41173a..aef52c4b7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -2001,7 +2001,7 @@ xstrtokenize(const char *str, const char *separators)
if (!tmp)
goto error;
for (tok = strtok(tmp, separators); tok; tok = strtok(NULL, separators)) {
- nlist = realloc(list, (num + 2) * sizeof(*list));
+ nlist = reallocarray(list, num + 2, sizeof(*list));
if (!nlist)
goto error;
list = nlist;