diff options
Diffstat (limited to 'sed/utils.c')
| -rw-r--r-- | sed/utils.c | 96 |
1 files changed, 24 insertions, 72 deletions
diff --git a/sed/utils.c b/sed/utils.c index a681c0d..ec9b2e6 100644 --- a/sed/utils.c +++ b/sed/utils.c @@ -81,10 +81,8 @@ panic(const char *str, ...) /* Internal routine to get a filename from open_files */ -static const char *utils_fp_name (FILE *fp); static const char * -utils_fp_name(fp) - FILE *fp; +utils_fp_name(FILE *fp) { struct open_file *p; @@ -102,10 +100,7 @@ utils_fp_name(fp) } static void -register_open_file (fp, name, temp) - FILE *fp; - const char *name; - int temp; +register_open_file (FILE *fp, const char *name, int temp) { struct open_file *p; for (p=open_files; p; p=p->link) @@ -129,10 +124,7 @@ register_open_file (fp, name, temp) /* Panic on failing fopen */ FILE * -ck_fopen(name, mode, fail) - const char *name; - const char *mode; - int fail; +ck_fopen(const char *name, const char *mode, int fail) { FILE *fp; @@ -151,11 +143,7 @@ ck_fopen(name, mode, fail) /* Panic on failing fdopen */ FILE * -ck_fdopen(fd, name, mode, fail) - int fd; - const char *name; - const char *mode; - int fail; +ck_fdopen( int fd, const char *name, const char *mode, int fail) { FILE *fp; @@ -173,10 +161,8 @@ ck_fdopen(fd, name, mode, fail) } FILE * -ck_mkstemp (p_filename, tmpdir, base, mode) - char **p_filename; - const char *base, *tmpdir; - const char *mode; +ck_mkstemp (char **p_filename, const char *tmpdir, + const char *base, const char *mode) { char *template; FILE *fp; @@ -217,11 +203,7 @@ ck_mkstemp (p_filename, tmpdir, base, mode) /* Panic on failing fwrite */ void -ck_fwrite(ptr, size, nmemb, stream) - const void *ptr; - size_t size; - size_t nmemb; - FILE *stream; +ck_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream) { clearerr(stream); if (size && fwrite(ptr, size, nmemb, stream) != nmemb) @@ -232,11 +214,7 @@ ck_fwrite(ptr, size, nmemb, stream) /* Panic on failing fread */ size_t -ck_fread(ptr, size, nmemb, stream) - void *ptr; - size_t size; - size_t nmemb; - FILE *stream; +ck_fread(void *ptr, size_t size, size_t nmemb, FILE *stream) { clearerr(stream); if (size && (nmemb=fread(ptr, size, nmemb, stream)) <= 0 && ferror(stream)) @@ -246,11 +224,7 @@ ck_fread(ptr, size, nmemb, stream) } size_t -ck_getdelim(text, buflen, buffer_delimiter, stream) - char **text; - size_t *buflen; - char buffer_delimiter; - FILE *stream; +ck_getdelim(char **text, size_t *buflen, char buffer_delimiter, FILE *stream) { ssize_t result; bool error; @@ -270,8 +244,7 @@ ck_getdelim(text, buflen, buffer_delimiter, stream) /* Panic on failing fflush */ void -ck_fflush(stream) - FILE *stream; +ck_fflush(FILE *stream) { if (!fwriting(stream)) return; @@ -283,8 +256,7 @@ ck_fflush(stream) /* Panic on failing fclose */ void -ck_fclose(stream) - FILE *stream; +ck_fclose(FILE *stream) { struct open_file r; struct open_file *prev; @@ -320,8 +292,7 @@ ck_fclose(stream) /* Close a single file. */ void -do_ck_fclose(fp) - FILE *fp; +do_ck_fclose(FILE *fp) { ck_fflush(fp); clearerr(fp); @@ -412,9 +383,7 @@ follow_symlink(const char *fname) /* Panic on failing rename */ void -ck_rename (from, to, unlink_if_fail) - const char *from, *to; - const char *unlink_if_fail; +ck_rename (const char *from, const char *to, const char *unlink_if_fail) { int rd = rename (from, to); if (rd != -1) @@ -441,8 +410,7 @@ ck_rename (from, to, unlink_if_fail) /* Panic on failing malloc */ void * -ck_malloc(size) - size_t size; +ck_malloc(size_t size) { void *ret = calloc(1, size ? size : 1); if (!ret) @@ -452,9 +420,7 @@ ck_malloc(size) /* Panic on failing realloc */ void * -ck_realloc(ptr, size) - void *ptr; - size_t size; +ck_realloc(void *ptr, size_t size) { void *ret; @@ -473,8 +439,7 @@ ck_realloc(ptr, size) /* Return a malloc()'d copy of a string */ char * -ck_strdup(str) - const char *str; +ck_strdup(const char *str) { char *ret = MALLOC(strlen(str)+1, char); return strcpy(ret, str); @@ -482,9 +447,7 @@ ck_strdup(str) /* Return a malloc()'d copy of a block of memory */ void * -ck_memdup(buf, len) - const void *buf; - size_t len; +ck_memdup(const void *buf, size_t len) { void *ret = ck_malloc(len); return memcpy(ret, buf, len); @@ -504,7 +467,7 @@ struct buffer #define MIN_ALLOCATE 50 struct buffer * -init_buffer() +init_buffer(void) { struct buffer *b = MALLOC(1, struct buffer); b->b = MALLOC(MIN_ALLOCATE, char); @@ -514,24 +477,19 @@ init_buffer() } char * -get_buffer(b) - struct buffer *b; +get_buffer(struct buffer *b) { return b->b; } size_t -size_buffer(b) - struct buffer *b; +size_buffer(struct buffer *b) { return b->length; } -static void resize_buffer (struct buffer *b, size_t newlen); static void -resize_buffer(b, newlen) - struct buffer *b; - size_t newlen; +resize_buffer(struct buffer *b, size_t newlen) { char *try = NULL; size_t alen = b->allocated; @@ -551,10 +509,7 @@ resize_buffer(b, newlen) } char * -add_buffer(b, p, n) - struct buffer *b; - const char *p; - size_t n; +add_buffer(struct buffer *b, const char *p, size_t n) { char *result; if (b->allocated - b->length < n) @@ -565,9 +520,7 @@ add_buffer(b, p, n) } char * -add1_buffer(b, c) - struct buffer *b; - int c; +add1_buffer(struct buffer *b, int c) { /* This special case should be kept cheap; * don't make it just a mere convenience @@ -589,8 +542,7 @@ add1_buffer(b, c) } void -free_buffer(b) - struct buffer *b; +free_buffer(struct buffer *b) { if (b) free(b->b); |