- Timestamp:
- Feb 11, 2011, 4:31:33 PM (13 years ago)
- Branches:
- master, release-1.10, release-1.8, release-1.9
- Children:
- 35b6eb9
- Parents:
- 9518a85
- git-author:
- Anders Kaseorg <andersk@mit.edu> (08/27/09 00:51:45)
- git-committer:
- Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:33)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zephyr.c
rdf3a1f4 r96828e4 229 229 owl_free(subs); 230 230 } else { 231 owl_sub_list *s = owl_malloc(sizeof(owl_sub_list));231 owl_sub_list *s = g_new(owl_sub_list, 1); 232 232 s->subs = subs; 233 233 s->nsubs = count; … … 259 259 struct stat statbuff; 260 260 261 subs = owl_malloc(sizeof(ZSubscription_t) *subSize);261 subs = g_new(ZSubscription_t, subSize); 262 262 subsfile = owl_zephyr_dotfile(".zephyr.subs", filename); 263 263 … … 333 333 int count, ret; 334 334 335 subs = owl_malloc(sizeof(ZSubscription_t) *subSize);335 subs = g_new(ZSubscription_t, subSize); 336 336 ZResetAuthentication(); 337 337 count=0; … … 377 377 struct stat statbuff; 378 378 379 subs = owl_malloc(numSubs * sizeof(ZSubscription_t));379 subs = g_new(ZSubscription_t, numSubs); 380 380 subsfile = owl_zephyr_dotfile(".anyone", filename); 381 381 … … 694 694 695 695 notice.z_message_len=strlen(zsig)+1+strlen(message); 696 notice.z_message= owl_malloc(notice.z_message_len+10);696 notice.z_message=g_new(char, notice.z_message_len+10); 697 697 strcpy(notice.z_message, zsig); 698 698 memcpy(notice.z_message+strlen(zsig)+1, message, strlen(message)); … … 1333 1333 if (ret == ZERR_NONE) { 1334 1334 /* Send a PSEUDO LOGIN! */ 1335 m = owl_malloc(sizeof(owl_message));1335 m = g_new(owl_message, 1); 1336 1336 owl_message_create_pseudo_zlogin(m, 0, zald->user, 1337 1337 location.host, … … 1346 1346 /* Send a PSEUDO LOGOUT! */ 1347 1347 if (notify) { 1348 m = owl_malloc(sizeof(owl_message));1348 m = g_new(owl_message, 1); 1349 1349 owl_message_create_pseudo_zlogin(m, 1, zald->user, "", "", ""); 1350 1350 owl_global_messagequeue_addmsg(&g, m); … … 1421 1421 1422 1422 /* create the new message */ 1423 m= owl_malloc(sizeof(owl_message));1423 m=g_new(owl_message, 1); 1424 1424 owl_message_create_from_znotice(m, ¬ice); 1425 1425
Note: See TracChangeset
for help on using the changeset viewer.