Mercurial > hg > nnchat
comparison util.c @ 634:5269a8cdbd96
Use th_malloc0(n) instead of th_calloc(1, n).
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sun, 22 Jun 2014 03:32:39 +0300 |
parents | 5b059a85cab8 |
children | f212cbfbd93c |
comparison
equal
deleted
inserted
replaced
633:ce605ac8167a | 634:5269a8cdbd96 |
---|---|
380 } | 380 } |
381 | 381 |
382 | 382 |
383 nn_editbuf_t * nn_editbuf_new(size_t n) | 383 nn_editbuf_t * nn_editbuf_new(size_t n) |
384 { | 384 { |
385 nn_editbuf_t *res = th_calloc(1, sizeof(nn_editbuf_t)); | 385 nn_editbuf_t *res = th_malloc0(sizeof(nn_editbuf_t)); |
386 | 386 |
387 res->data = (char *) th_malloc(n); | 387 res->data = (char *) th_malloc(n); |
388 res->size = n; | 388 res->size = n; |
389 res->dirty = TRUE; | 389 res->dirty = TRUE; |
390 | 390 |
583 } | 583 } |
584 | 584 |
585 | 585 |
586 nn_userhash_t *nn_userhash_new(void) | 586 nn_userhash_t *nn_userhash_new(void) |
587 { | 587 { |
588 return th_calloc(1, sizeof(nn_userhash_t)); | 588 return th_malloc0(sizeof(nn_userhash_t)); |
589 } | 589 } |
590 | 590 |
591 | 591 |
592 int nn_userhash_insert(nn_userhash_t *list, const char *name) | 592 int nn_userhash_insert(nn_userhash_t *list, const char *name) |
593 { | 593 { |
601 // Check if username is already there | 601 // Check if username is already there |
602 if (nn_userhash_find(list, name) != NULL) | 602 if (nn_userhash_find(list, name) != NULL) |
603 return 1; | 603 return 1; |
604 | 604 |
605 // No, we'll add it | 605 // No, we'll add it |
606 if ((user = th_calloc(1, sizeof(nn_user_t))) == NULL) | 606 if ((user = th_malloc0(sizeof(nn_user_t))) == NULL) |
607 return -3; | 607 return -3; |
608 | 608 |
609 user->name = th_strdup(name); | 609 user->name = th_strdup(name); |
610 if (user->name == NULL) | 610 if (user->name == NULL) |
611 return -4; | 611 return -4; |
701 } | 701 } |
702 | 702 |
703 | 703 |
704 nn_strtuple_t *nn_strtuple_new(size_t len, char *str) | 704 nn_strtuple_t *nn_strtuple_new(size_t len, char *str) |
705 { | 705 { |
706 nn_strtuple_t *tuple = th_calloc(1, sizeof(nn_strtuple_t)); | 706 nn_strtuple_t *tuple = th_malloc0(sizeof(nn_strtuple_t)); |
707 tuple->len = len; | 707 tuple->len = len; |
708 tuple->str = str; | 708 tuple->str = str; |
709 return tuple; | 709 return tuple; |
710 } | 710 } |
711 | 711 |