chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
@@ -8,6 +8,9 @@
[userv.git]
/
lib.c
diff --git
a/lib.c
b/lib.c
index 22c8cd1750a52af1855b242104191d6abb3028a1..1352afa24d74fedcf48c2f369ebda1187f5ec33e 100644
(file)
--- a/
lib.c
+++ b/
lib.c
@@
-31,6
+31,7
@@
#include "config.h"
#include "common.h"
#include "lib.h"
#include "config.h"
#include "common.h"
#include "lib.h"
+#include "both.h"
char *xstrcat3save(const char *a, const char *b, const char *c) {
char *r;
char *xstrcat3save(const char *a, const char *b, const char *c) {
char *r;
@@
-42,14
+43,6
@@
char *xstrcat3save(const char *a, const char *b, const char *c) {
return r;
}
return r;
}
-char *xstrsave(const char *s) {
- char *r;
-
- r= xmalloc(strlen(s)+1);
- strcpy(r,s);
- return r;
-}
-
char *xstrsubsave(const char *begin, int len) {
char *r;
char *xstrsubsave(const char *begin, int len) {
char *r;
@@
-59,17
+52,6
@@
char *xstrsubsave(const char *begin, int len) {
return r;
}
return r;
}
-void *xmalloc(size_t s) {
- void *p;
- p= malloc(s?s:1); if (!p) syscallerror("malloc");
- return p;
-}
-
-void *xrealloc(void *p, size_t s) {
- p= realloc(p,s); if (!p) syscallerror("realloc");
- return p;
-}
-
int makeroom(char **buffer, int *size, int needed) {
if (needed > MAX_GENERAL_STRING) return -1;
if (*size >= needed) return 0;
int makeroom(char **buffer, int *size, int needed) {
if (needed > MAX_GENERAL_STRING) return -1;
if (*size >= needed) return 0;