pkt-line: extern packet_length()
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
May 19, 2020 at 06:53 UTC
101736a14c9ad734fe24efed7513189849cd22eb
2 files changed
+12
-3
pkt-line.c
+3
-3
@@ -306,10 +306,10 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
306
return ret;
307
}
308
309
-static int packet_length(const char *linelen)
309
+int packet_length(const char lenbuf_hex[4])
310
{
311
- int val = hex2chr(linelen);
312
- return (val < 0) ? val : (val << 8) | hex2chr(linelen + 2);
311
+ int val = hex2chr(lenbuf_hex);
312
+ return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2);
313
}
314
315
enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
pkt-line.h
+9
@@ -74,6 +74,15 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out);
74
int packet_read(int fd, char **src_buffer, size_t *src_len, char
75
*buffer, unsigned size, int options);
76
77
+/*
78
+ * Convert a four hex digit packet line length header into its numeric
79
+ * representation.
80
+ *
81
+ * If lenbuf_hex contains non-hex characters, return -1. Otherwise, return the
82
+ * numeric value of the length header.
83
+ */
84
+int packet_length(const char lenbuf_hex[4]);
85
+
86
/*
87
* Read a packetized line into a buffer like the 'packet_read()' function but
88
* returns an 'enum packet_read_status' which indicates the status of the read.