| Message ID | 36885943b239807eda49e231d8a45e1991f7288e.1589885479.git.liu.denton@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | remote-curl: fix deadlocks when remote server disconnects | expand |
On Tue, May 19, 2020 at 6:54 AM Denton Liu <liu.denton@gmail.com> wrote: > [...] > Change the function parameter from `const char *linelen` to > `const char lenbuf_hex[4]`. Even though these two types behave > identically as function parameters, use the array notation to > semantically indicate exactly what this function is expecting as an > argument. Also, rename it from linelen to lenbuf_hex as the former > sounds like it should be an integral type which is misleading. > > Signed-off-by: Denton Liu <liu.denton@gmail.com> > --- > diff --git a/pkt-line.h b/pkt-line.h > @@ -74,6 +74,15 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out); > +/* > + * Convert a four hex digit packet line length header into its numeric > + * representation. > + * > + * If linelen contains non-hex characters, return -1. Otherwise, return the s/linelen/lenbuf_hex/ ...or... s/lenbuf_hex/input argument/ > + * numeric value of the length header. > + */ > +int packet_length(const char lenbuf_hex[4]);
diff --git a/pkt-line.c b/pkt-line.c index a0e87b1e81..3beab1dc6b 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -306,10 +306,10 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size, return ret; } -static int packet_length(const char *linelen) +int packet_length(const char lenbuf_hex[4]) { - int val = hex2chr(linelen); - return (val < 0) ? val : (val << 8) | hex2chr(linelen + 2); + int val = hex2chr(lenbuf_hex); + return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2); } enum packet_read_status packet_read_with_status(int fd, char **src_buffer, diff --git a/pkt-line.h b/pkt-line.h index fef3a0d792..0d92c5e17f 100644 --- a/pkt-line.h +++ b/pkt-line.h @@ -74,6 +74,15 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out); int packet_read(int fd, char **src_buffer, size_t *src_len, char *buffer, unsigned size, int options); +/* + * Convert a four hex digit packet line length header into its numeric + * representation. + * + * If linelen contains non-hex characters, return -1. Otherwise, return the + * numeric value of the length header. + */ +int packet_length(const char lenbuf_hex[4]); + /* * Read a packetized line into a buffer like the 'packet_read()' function but * returns an 'enum packet_read_status' which indicates the status of the read.
In a future commit, we will be manually processing packets and we will need to access the length header. In order to simplify this, extern packet_length() so that the logic can be reused. Change the function parameter from `const char *linelen` to `const char lenbuf_hex[4]`. Even though these two types behave identically as function parameters, use the array notation to semantically indicate exactly what this function is expecting as an argument. Also, rename it from linelen to lenbuf_hex as the former sounds like it should be an integral type which is misleading. Signed-off-by: Denton Liu <liu.denton@gmail.com> --- pkt-line.c | 6 +++--- pkt-line.h | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-)