ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/branches/8.2.x/src/conf.c
(Generate patch)

Comparing ircd-hybrid/branches/8.2.x/src/conf.c (file contents):
Revision 7032 by michael, Fri Jan 1 00:09:08 2016 UTC vs.
Revision 7033 by michael, Sun Jan 3 14:37:29 2016 UTC

# Line 168 | Line 168 | map_to_list(enum maskitem_type type)
168   struct MaskItem *
169   conf_make(enum maskitem_type type)
170   {
171 <  struct MaskItem *const conf = MyCalloc(sizeof(*conf));
171 >  struct MaskItem *const conf = xcalloc(sizeof(*conf));
172    dlink_list *list = NULL;
173  
174    conf->type   = type;
# Line 189 | Line 189 | conf_free(struct MaskItem *conf)
189    if ((list = map_to_list(conf->type)))
190      dlinkFindDelete(list, conf);
191  
192 <  MyFree(conf->name);
192 >  xfree(conf->name);
193  
194    if (conf->dns_pending)
195      delete_resolver_queries(conf);
# Line 200 | Line 200 | conf_free(struct MaskItem *conf)
200  
201    conf->class = NULL;
202  
203 <  MyFree(conf->passwd);
204 <  MyFree(conf->spasswd);
205 <  MyFree(conf->reason);
206 <  MyFree(conf->certfp);
207 <  MyFree(conf->whois);
208 <  MyFree(conf->user);
209 <  MyFree(conf->host);
203 >  xfree(conf->passwd);
204 >  xfree(conf->spasswd);
205 >  xfree(conf->reason);
206 >  xfree(conf->certfp);
207 >  xfree(conf->whois);
208 >  xfree(conf->user);
209 >  xfree(conf->host);
210   #ifdef HAVE_LIBCRYPTO
211 <  MyFree(conf->cipher_list);
211 >  xfree(conf->cipher_list);
212  
213    if (conf->rsa_public_key)
214      RSA_free(conf->rsa_public_key);
215   #endif
216    DLINK_FOREACH_SAFE(node, node_next, conf->hub_list.head)
217    {
218 <    MyFree(node->data);
218 >    xfree(node->data);
219      dlinkDelete(node, &conf->hub_list);
220      free_dlink_node(node);
221    }
222  
223    DLINK_FOREACH_SAFE(node, node_next, conf->leaf_list.head)
224    {
225 <    MyFree(node->data);
225 >    xfree(node->data);
226      dlinkDelete(node, &conf->leaf_list);
227      free_dlink_node(node);
228    }
# Line 232 | Line 232 | conf_free(struct MaskItem *conf)
232      struct exempt *exptr = node->data;
233  
234      dlinkDelete(node, &conf->exempt_list);
235 <    MyFree(exptr->name);
236 <    MyFree(exptr->user);
237 <    MyFree(exptr->host);
238 <    MyFree(exptr);
235 >    xfree(exptr->name);
236 >    xfree(exptr->user);
237 >    xfree(exptr->host);
238 >    xfree(exptr);
239    }
240  
241 <  MyFree(conf);
241 >  xfree(conf);
242   }
243  
244   /* attach_iline()
# Line 1198 | Line 1198 | clear_out_old_conf(void)
1198    pseudo_clear();
1199  
1200    /* Clean out ConfigServerInfo */
1201 <  MyFree(ConfigServerInfo.description);
1201 >  xfree(ConfigServerInfo.description);
1202    ConfigServerInfo.description = NULL;
1203 <  MyFree(ConfigServerInfo.network_name);
1203 >  xfree(ConfigServerInfo.network_name);
1204    ConfigServerInfo.network_name = NULL;
1205 <  MyFree(ConfigServerInfo.network_desc);
1205 >  xfree(ConfigServerInfo.network_desc);
1206    ConfigServerInfo.network_desc = NULL;
1207   #ifdef HAVE_LIBCRYPTO
1208    if (ConfigServerInfo.rsa_private_key)
# Line 1211 | Line 1211 | clear_out_old_conf(void)
1211      ConfigServerInfo.rsa_private_key = NULL;
1212    }
1213  
1214 <  MyFree(ConfigServerInfo.rsa_private_key_file);
1214 >  xfree(ConfigServerInfo.rsa_private_key_file);
1215    ConfigServerInfo.rsa_private_key_file = NULL;
1216   #endif
1217  
1218    /* Clean out ConfigAdminInfo */
1219 <  MyFree(ConfigAdminInfo.name);
1219 >  xfree(ConfigAdminInfo.name);
1220    ConfigAdminInfo.name = NULL;
1221 <  MyFree(ConfigAdminInfo.email);
1221 >  xfree(ConfigAdminInfo.email);
1222    ConfigAdminInfo.email = NULL;
1223 <  MyFree(ConfigAdminInfo.description);
1223 >  xfree(ConfigAdminInfo.description);
1224    ConfigAdminInfo.description = NULL;
1225  
1226 <  MyFree(ConfigServerHide.flatten_links_file);
1226 >  xfree(ConfigServerHide.flatten_links_file);
1227    ConfigServerHide.flatten_links_file = NULL;
1228  
1229    /* Clean out listeners */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines