diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2023-12-21 09:59:54 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2023-12-21 09:59:54 +0000 |
| commit | 00f573313416c8b3bfc8b32f157b0d64311382c0 (patch) | |
| tree | 4a3150e60d2ba1a12e16f8e30ac63cb41b3963b2 | |
| parent | 289236dd5a7f05bd5253840fa03d358ca51406b0 (diff) | |
| download | tipidee-00f573313416c8b3bfc8b32f157b0d64311382c0.tar.xz | |
Minor refactors
Signed-off-by: Laurent Bercot <ska@appnovation.com>
| -rw-r--r-- | src/tipideed/send_file.c | 2 | ||||
| -rw-r--r-- | src/tipideed/tipideed-internal.h | 12 | ||||
| -rw-r--r-- | src/tipideed/tipideed.c | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/tipideed/send_file.c b/src/tipideed/send_file.c index bcbd1c7..6e55c7b 100644 --- a/src/tipideed/send_file.c +++ b/src/tipideed/send_file.c @@ -164,7 +164,7 @@ void send_file_range (int fd, uint64_t offset, uint64_t n, char const *fn) tain deadline ; struct iovec v[2] ; ssize_t r ; - if (!n) goto flushit ; /* I know, I know, but do-while SUCKS */ + if (!n) goto flushit ; if (offset && lseek(fd, offset, SEEK_SET) == -1) strerr_diefu2sys(111, "lseek on ", fn) ; fillit: diff --git a/src/tipideed/tipideed-internal.h b/src/tipideed/tipideed-internal.h index 4b35efa..1087b15 100644 --- a/src/tipideed/tipideed-internal.h +++ b/src/tipideed/tipideed-internal.h @@ -77,7 +77,7 @@ extern struct global_s g ; extern void tipideed_harden (unsigned int) ; - /* Responses */ + /* errors */ #define response_error_early(rql, status, reason, text, options) response_error_early_plus(rql, status, reason, text, 0, 0, options) extern void response_error_early_plus (tipidee_rql const *, unsigned int, char const *, char const *, tipidee_response_header const *, uint32_t, uint32_t) ; @@ -103,7 +103,6 @@ extern void exit_405 (tipidee_rql const *, char const *, uint32_t) gccattr_noret #define exit_413(r, d) response_error_and_exit(r, (d), 413) #define exit_501(r, d) response_error_and_exit(r, (d), 501) -extern void respond_30x (tipidee_rql const *, tipidee_redirection const *) ; extern void respond_416 (tipidee_rql const *, char const *, uint64_t) ; #define respond_403(r, d) response_error(r, (d), 403, 0) @@ -118,12 +117,17 @@ extern void respond_416 (tipidee_rql const *, char const *, uint64_t) ; #define die502x(r, e, d, ...) diefx(r, e, d, 502, __VA_ARGS__) - /* Trace */ + /* redirection */ + +extern void respond_30x (tipidee_rql const *, tipidee_redirection const *) ; + + + /* trace */ extern int respond_trace (tipidee_rql const *, tipidee_headers const *) ; - /* Options */ + /* options */ extern int respond_options (tipidee_rql const *, uint32_t) ; diff --git a/src/tipideed/tipideed.c b/src/tipideed/tipideed.c index 75a8195..a8dd944 100644 --- a/src/tipideed/tipideed.c +++ b/src/tipideed/tipideed.c @@ -202,7 +202,7 @@ static inline void get_resattr (tipidee_rql const *rql, char const *docroot, cha if (errno == EPERM) die500x(rql, 102, docroot, "resource ", res, " points outside of the server's root") ; else - die500sys(rql, 111, docroot, "path_canonicalize ", res) ; + die500sys(rql, 111, docroot, "translate_path ", res) ; } if (!tipidee_conf_get_resattr(&g.conf, g.sa.s + pos, ra)) die500sys(rql, 102, docroot, "look up resource attributes for ", g.sa.s + pos) ; |