projects / packages / recode.git / blame
| Commit | Line | Data |
|---|---|---|
| c4b576de JB |
1 | diff -Nur recode-3.6.orig/src/Makefile.am recode-3.6/src/Makefile.am |
| 2 | --- recode-3.6.orig/src/Makefile.am Wed Dec 6 17:36:12 2000 | |
| 3 | +++ recode-3.6/src/Makefile.am Sun Oct 27 10:56:18 2002 | |
| 4 | @@ -43,11 +43,11 @@ | |
| a54c8b7c | 5 | L_SURFACES = |
| 6 | ||
| 7 | recode_SOURCES = main.c freeze.c mixed.c | |
| 8 | -recode_LDADD = librecode.la ../lib/libreco.a | |
| 9 | +recode_LDADD = librecode.la | |
| 10 | ||
| 11 | librecode_la_SOURCES = argmatch.c charname.c combine.c fr-charname.c \ | |
| c4b576de JB |
12 | hash.c iconv.c libiconv.c localcharset.c merged.c names.c outer.c quotearg.c \ |
| 13 | -recode.c request.c strip-pool.c task.c xmalloc.c $(C_STEPS) | |
| 14 | +recode.c request.c strip-pool.c task.c $(C_STEPS) | |
| 15 | librecode_la_LDFLAGS = -version-info 0:0:0 | |
| 16 | ||
| 17 | INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/libiconv | |
| 18 | diff -Nur recode-3.6.orig/src/main.c recode-3.6/src/main.c | |
| 19 | --- recode-3.6.orig/src/main.c Wed Dec 6 20:44:59 2000 | |
| 20 | +++ recode-3.6/src/main.c Sun Oct 27 10:58:04 2002 | |
| 21 | @@ -510,7 +510,7 @@ | |
| a54c8b7c | 22 | unsigned counter; |
| 23 | ||
| 24 | header_name++; | |
| 25 | - buffer = (char *) xmalloc ((size_t) (header_name - optarg)); | |
| 26 | + buffer = (char *) malloc ((size_t) (header_name - optarg)); | |
| 27 | if (*header_name == NUL) | |
| 28 | header_name = NULL; | |
| 29 | for (counter = 0; optarg[counter] != '/'; counter++) | |
| c4b576de | 30 | @@ -782,7 +782,7 @@ |
| a54c8b7c | 31 | { |
| c4b576de | 32 | char *cursor2; |
| a54c8b7c | 33 | |
| c4b576de JB |
34 | - rewritten_request = (char *) xmalloc (strlen (user_request) + 2); |
| 35 | + rewritten_request = (char *) malloc (strlen (user_request) + 2); | |
| 36 | cursor2 = rewritten_request; | |
| a54c8b7c | 37 | for (cursor = user_request; *cursor != ':'; cursor++) |
| c4b576de JB |
38 | *cursor2++ = *cursor; |
| 39 | diff -Nur recode-3.6.orig/src/quotearg.c recode-3.6/src/quotearg.c | |
| 40 | --- recode-3.6.orig/src/quotearg.c Thu Aug 3 03:21:15 2000 | |
| 41 | +++ recode-3.6/src/quotearg.c Sun Oct 27 10:58:53 2002 | |
| a54c8b7c | 42 | @@ -25,7 +25,7 @@ |
| 43 | ||
| 44 | #include <sys/types.h> | |
| 45 | #include <quotearg.h> | |
| 46 | -#include <xalloc.h> | |
| 47 | +#include <stdlib.h> | |
| 48 | ||
| 49 | #include <ctype.h> | |
| 50 | #if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII)) | |
| 51 | @@ -110,7 +110,7 @@ | |
| 52 | clone_quoting_options (struct quoting_options *o) | |
| 53 | { | |
| 54 | struct quoting_options *p | |
| 55 | - = (struct quoting_options *) xmalloc (sizeof (struct quoting_options)); | |
| 56 | + = (struct quoting_options *) malloc (sizeof (struct quoting_options)); | |
| 57 | *p = *(o ? o : &default_quoting_options); | |
| 58 | return p; | |
| 59 | } | |
| 60 | @@ -339,7 +339,7 @@ | |
| 61 | size_t s = n1 * sizeof (struct slotvec); | |
| 62 | if (! (0 < n1 && n1 == s / sizeof (struct slotvec))) | |
| 63 | abort (); | |
| 64 | - slotvec = (struct slotvec *) xrealloc (slotvec, s); | |
| 65 | + slotvec = (struct slotvec *) realloc (slotvec, s); | |
| 66 | memset (slotvec + nslots, 0, (n1 - nslots) * sizeof (struct slotvec)); | |
| 67 | nslots = n; | |
| 68 | } | |
| 69 | @@ -352,7 +352,7 @@ | |
| 70 | if (size <= qsize) | |
| 71 | { | |
| 72 | slotvec[n].size = size = qsize + 1; | |
| 73 | - slotvec[n].val = val = xrealloc (val, size); | |
| 74 | + slotvec[n].val = val = realloc (val, size); | |
| 75 | quotearg_buffer (val, size, arg, (size_t) -1, options); | |
| 76 | } | |
| 77 |