From 9b9dd8cc7d3a6fd05750d4f41720cf6094780551 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 26 十一月 2020 16:46:14 +0800
Subject: [PATCH] update
---
src/socket/net_mod_socket_io.c | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/socket/net_mod_socket_io.c b/src/socket/net_mod_socket_io.c
index 631d30a..8981690 100644
--- a/src/socket/net_mod_socket_io.c
+++ b/src/socket/net_mod_socket_io.c
@@ -2,14 +2,13 @@
#include "socket_io.h"
#include <stdint.h>
-ssize_t rio_readpkgb(rio_t *rp, char *usrbuf, size_t maxlen)
+ssize_t rio_read_until_sep(rio_t *rp, char *usrbuf, size_t maxlen, const char *sep)
{
int n, rc;
char c;
char *bufp = usrbuf;
- int pkg_sep_i = 0;
- int pkg_sep_len = strlen(PKG_SEP);
- const char * pkg_sep = PKG_SEP;
+ int sep_i = 0;
+ int sep_len = strlen(sep);
for (n = 0; n < maxlen; n++)
{
@@ -18,15 +17,15 @@
*bufp++ = c;
- if(c == *(pkg_sep + pkg_sep_i)) {
- pkg_sep_i++;
- if(pkg_sep_i == pkg_sep_len) {
+ if(c == *(sep + sep_i)) {
+ sep_i++;
+ if(sep_i == sep_len) {
break;
}
} else {
- pkg_sep_i = 0;
+ sep_i = 0;
}
}
@@ -41,9 +40,9 @@
return -1; /* Error */
}
- if(pkg_sep_i == pkg_sep_len) {
- *(bufp - pkg_sep_len) = 0;
- return n - pkg_sep_len;
+ if(sep_i == sep_len) {
+ *(bufp - sep_len) = 0;
+ return n - sep_len;
} else {
return -1;
}
--
Gitblit v1.8.0