Rename malloc.c to alloc.c, and my master Makefile to GNUmakefile,

in the probably vain hope of playing more nicely with autoconf.

git-svn-id: svn://svn.tartarus.org/sgt/agedu@8260 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/GNUmakefile
similarity index 91%
rename from Makefile
rename to GNUmakefile
index 1c12460..339cc15 100644 (file)
--- a/Makefile
+++ b/GNUmakefile
@@ -13,7 +13,7 @@ CFLAGS = -Wall --std=c99 -pedantic $(XFLAGS)
 
 -include Makefile.local
 
-AGEDU_MODULES := agedu du malloc trie index html httpd fgetline licence
+AGEDU_MODULES := agedu du alloc trie index html httpd fgetline licence
 AGEDU_OBJS := $(patsubst %,%.o,$(AGEDU_MODULES))
 
 ALLMODULES := $(sort $(AGEDU_MODULES))

diff --git a/agedu.c b/agedu.c
index caef604..15b366a 100644 (file)
--- a/agedu.c
+++ b/agedu.c
@@ -24,7 +24,7 @@
 #include "du.h"
 #include "trie.h"
 #include "index.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "html.h"
 #include "httpd.h"
 #include "fgetline.h"

diff --git a/malloc.c b/alloc.c
similarity index 97%
rename from malloc.c
rename to alloc.c
index 7de2e13..e5c018f 100644 (file)
--- a/malloc.c
+++ b/alloc.c
@@ -1,5 +1,5 @@
 /*
- * malloc.c: implementation of malloc.h
+ * alloc.c: implementation of alloc.h
  */
 
 #include <stdlib.h>
@@ -10,7 +10,7 @@
 #include <stdio.h>
 
 #include "agedu.h"
-#include "malloc.h"
+#include "alloc.h"
 
 extern void fatal(const char *, ...);
 

diff --git a/malloc.h b/alloc.h
similarity index 93%
rename from malloc.h
rename to alloc.h
index bd01899..654dd50 100644 (file)
--- a/malloc.h
+++ b/alloc.h
@@ -1,9 +1,9 @@
 /*
- * malloc.h: safe wrappers around malloc, realloc, free, strdup
+ * alloc.h: safe wrappers around malloc, realloc, free, strdup
  */
 
-#ifndef AGEDU_MALLOC_H
-#define AGEDU_MALLOC_H
+#ifndef AGEDU_ALLOC_H
+#define AGEDU_ALLOC_H
 
 #include <stddef.h>
 
@@ -72,4 +72,4 @@ char *dupfmt(const char *fmt, ...);
     ( (void)sizeof((array)-(type *)0), \
       (type *) srealloc ((array), (number) * sizeof (type)) )
 
-#endif /* AGEDU_MALLOC_H */
+#endif /* AGEDU_ALLOC_H */

diff --git a/du.c b/du.c
index 957c6e7..30a880d 100644 (file)
--- a/du.c
+++ b/du.c
@@ -15,7 +15,7 @@
 #include <unistd.h>
 
 #include "du.h"
-#include "malloc.h"
+#include "alloc.h"
 
 #ifdef __linux__
 

diff --git a/fgetline.c b/fgetline.c
index 15b3af0..39696ac 100644 (file)
--- a/fgetline.c
+++ b/fgetline.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "malloc.h"
+#include "alloc.h"
 #include "fgetline.h"
 
 char *fgetline(FILE *fp)

diff --git a/html.c b/html.c
index 7633dec..48f1827 100644 (file)
--- a/html.c
+++ b/html.c
@@ -13,7 +13,7 @@
 
 #include "agedu.h"
 #include "html.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "trie.h"
 #include "index.h"
 

diff --git a/httpd.c b/httpd.c
index a11d6e7..8087a28 100644 (file)
--- a/httpd.c
+++ b/httpd.c
@@ -21,7 +21,7 @@
 #include <syslog.h>
 
 #include "agedu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "html.h"
 #include "httpd.h"
 

diff --git a/index.c b/index.c
index 2d1f840..56d657d 100644 (file)
--- a/index.c
+++ b/index.c
@@ -8,7 +8,7 @@
 
 #include "trie.h"
 #include "index.h"
-#include "malloc.h"
+#include "alloc.h"
 
 #define alignof(typ) ( offsetof(struct { char c; typ t; }, t) )
 

diff --git a/trie.c b/trie.c
index 1344bdf..eb9fb81 100644 (file)
--- a/trie.c
+++ b/trie.c
@@ -12,7 +12,7 @@
 #include <unistd.h>
 
 #include "agedu.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "trie.h"
 
 #define alignof(typ) ( offsetof(struct { char c; typ t; }, t) )