1 files changed, 13 insertions, 13 deletions

diff --git a/src/config.c b/src/config.c
index df9816e..8250749 100644
--- a/src/config.c
+++ b/src/config.c
@@ -137,25 +137,25 @@ safe_file_name (char *file_name)
     {
       file_name[0] = '/';
       file_name[1] = 0;
     }
 
   return file_name;
 }
 
 /* Same as safe_file_name, but returns an allocated copy. */
 char *
 safe_file_name_alloc (const char *file_name)
 {
-  char *s = xstrdup (file_name);
+  char *s = grecs_strdup (file_name);
   char *ns = safe_file_name (s);
   if (!ns)
     free (s);
   return ns;
 }
 
 
 static struct keyword event_tab[] = {
   { "success", ev_success },
   { "bad-ownership", ev_bad_ownership },
   { "bad-directive-signature", ev_bad_directive_signature },
   { "bad-detached-signature", ev_bad_detached_signature },
@@ -540,70 +540,70 @@ cb_sql_host (enum grecs_callback_command cmd,
   char *p;
 
   if (assert_string_arg (locus, cmd, value))
     return 1;
 
   p = strchr (value->v.string, ':');
   if (p)
     {
       /* FIXME: Modifies constant string */
       *p++ = 0;
       if (p[0] == '/')
         {
-          pconn->socket = xstrdup (p);
-          pconn->host = xstrdup ("localhost");
+          pconn->socket = grecs_strdup (p);
+          pconn->host = grecs_strdup ("localhost");
         }
       else
         {
           char *end;
           unsigned long n = strtoul (p, &end, 10);
           if (*end)
             {
               grecs_error (locus, 0, _("invalid port number (near %s)"), end);
               return 0;
             }
           if (n == 0 || n > USHRT_MAX)
             {
               grecs_error (locus, 0, _("port number out of range 1..%d"),
                            USHRT_MAX);
               return 0;
             }
           pconn->port = n;
           /* Save host name */
-          pconn->host = xstrdup (value->v.string);
+          pconn->host = grecs_strdup (value->v.string);
         }
     }
   else
-    pconn->host = xstrdup (value->v.string);
+    pconn->host = grecs_strdup (value->v.string);
   return 0;
 }
 
 static int
 cb_sql (enum grecs_callback_command cmd,
         grecs_locus_t *locus,
         void *varptr,
         grecs_value_t *value,
         void *cb_data)
 {
   struct sqlconn *pconn;
   void **pdata = cb_data;
 
   switch (cmd) {
   case grecs_callback_section_begin:
     if (!value || value->type != GRECS_TYPE_STRING)
       {
         grecs_error(locus, 0, _("tag must be a string"));
         return 0;
       }
-    pconn = xzalloc (sizeof (*pconn));
+    pconn = grecs_zalloc (sizeof (*pconn));
     pconn->ident = strdup (value->v.string);
     *pdata = pconn;
     break;
 
   case grecs_callback_section_end:
     pconn = *pdata;
     sql_register_conn (pconn);
     free (pconn);
     *pdata = NULL;
     break;
 
   case grecs_callback_set_value:
@@ -887,25 +887,25 @@ static struct grecs_keyword notify_event_kw[] = {
 static int
 cb_notify_event (enum grecs_callback_command cmd,
                  grecs_locus_t *locus,
                  void *varptr,
                  grecs_value_t *value,
                  void *cb_data)
 {
   struct notification *ntf;
   void **pdata = cb_data;
 
   switch (cmd) {
   case grecs_callback_section_begin:
-    ntf = xzalloc (sizeof (*ntf));
+    ntf = grecs_zalloc (sizeof (*ntf));
     *pdata = ntf;
     break;
 
   case grecs_callback_section_end:
     ntf = *pdata;
     if (!ntf->msg)
       grecs_error (locus, 0, _("missing message definition"));
     else
       {
         struct notification **p = (struct notification **) varptr;
         ntf->next = *p;
         *p = ntf;
@@ -975,34 +975,34 @@ cb_dictionary_params (enum grecs_callback_command cmd,
   size = grecs_list_size (value->v.list);
   if (size == 0)
     {
       meth->parmc = 0;
       meth->parmv = NULL;
     }
   else
     {
       int i;
       struct grecs_list_entry *ep;
 
       meth->parmc = size;
-      meth->parmv = xcalloc (size + 1, sizeof (meth->parmv[0]));
+      meth->parmv = grecs_calloc (size + 1, sizeof (meth->parmv[0]));
 
       for (i = 0, ep = value->v.list->head; ep; ep = ep->next, i++)
         {
           const grecs_value_t *vp = ep->data;
 
           if (assert_string_arg (locus, cmd, vp))
             break;
 
-          meth->parmv[i] = xstrdup (vp->v.string);
+          meth->parmv[i] = grecs_strdup (vp->v.string);
         }
       meth->parmv[i] = NULL;
     }
   return 0;
 }
 
 static struct grecs_keyword dictionary_kw[] = {
   { "type", N_("type"), N_("Dictionary type"),
     grecs_type_string, NULL, offsetof(struct dictionary, type),
     cb_dictionary_type },
   { "query", N_("string"), N_("Query template"),
     grecs_type_string, NULL, offsetof(struct dictionary, query) },
@@ -1150,26 +1150,26 @@ cb_spool (enum grecs_callback_command cmd,
   struct spool *spool;
   void **pdata = cb_data;
   int rc, ec, i;
 
   switch (cmd)
     {
     case grecs_callback_section_begin:
       if (!value || value->type != GRECS_TYPE_STRING)