From 489432d354d88049afe4af54c29965d382d67f7a Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org.ua>
Date: Fri, 8 Jan 2016 15:31:17 +0200
Subject: Uniformly use grecs memory management functions.

* gnulib.modules: Remove unneded modules.
* ident/ident.h: Remove xalloc.h, include errno.h
* ident/ident.c: Use standard allocation functions instead of x*
* ident/pam.c: Remove.
* ident/provider.c: Remove.
* ident/system.c: Remove.

* src/meta.c: Remove.
* src/Makefile.am: Remove meta.c
* src/progman.c: Use grecs_* allocation functions instead of x*.
(notify): Use wordsplit to expand variables within message.
Rename variables: program-name to program_name;
canonical-program-name to canonical_program_name.

* doc/pies.texi: Update.

* src/depmap.c: Use grecs_* allocation functions instead of x*.
(depmap_end): New function.

* src/diag.c (logmsg_vprintf): Use grecs_txtacc instead of obstack.
* src/pies.h (depmap_end): New proto.
Remove unused includes.

* src/acl.c: Use grecs_* allocation functions instead of x*.
* src/ctl.c: Likewise.
* src/inetd.c: Likewise.
* src/limits.c: Likewise.
* src/meta1gram.y: Likewise.
* src/meta1lex.l: Likewise.
* src/pies.c: Likewise.
* src/socket.c: Likewise.
* src/sysvinit.c: Likewise.
* src/userprivs.c: Likewise.
---
 src/pies.h | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'src/pies.h')

diff --git a/src/pies.h b/src/pies.h
index f22ccb2..e0d24d2 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -50,11 +50,6 @@
 #include "progname.h"
 #include "inttostr.h"
 #include "c-ctype.h"
-#include "xalloc.h"
-#define obstack_chunk_alloc xmalloc
-#define obstack_chunk_free free
-#include "obstack.h"
-#include "xvasprintf.h"
 #include "quotearg.h"
 #include "fprintftime.h"
 
@@ -360,6 +355,7 @@ void depmap_tc (pies_depmap_t dmap);
 size_t depmap_first (pies_depmap_t dmap, enum pies_depmap_direction dir,
 		     size_t coord, pies_depmap_pos_t *ppos);
 size_t depmap_next (pies_depmap_t dmap, pies_depmap_pos_t pos);
+void depmap_end (pies_depmap_pos_t pos);
 
 int assert_grecs_value_type (grecs_locus_t *locus,
 			     const grecs_value_t *value, int type);
@@ -449,21 +445,6 @@ void debug_msg (const char *fmt, ...) PIES_PRINTFLIKE(1,2);
 	debug_msg args;							\
       }									\
   while (0)
-
-
-/* meta.c */
-struct metadef
-{
-  char *kw;
-  char *value;
-  const char *(*expand) (struct metadef *, void *);
-  char *storage;
-  void *data;
-};
-
-char *meta_expand_string (const char *string, struct metadef *def, void *data);
-void meta_free (struct metadef *def);
-
 
 /* userprivs.c */
 int switch_to_privs (uid_t uid, gid_t gid, struct grecs_list *retain_groups);
-- 
cgit v1.2.1