Skip to content

Commit d5bb239

Browse files
committed
io: reverted some changes due to PR review
1 parent 60001d5 commit d5bb239

1 file changed

Lines changed: 2 additions & 14 deletions

File tree

src/io.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@ nc_read(struct nc_session *session, char *buf, uint32_t count, uint32_t inact_ti
109109
session->status = NC_STATUS_INVALID;
110110
session->term_reason = NC_SESSION_TERM_DROPPED;
111111
return -1;
112-
} else if (r > (count - readd)) {
113-
ERR(session, "Invalid number of bytes read (%ld > %u)", r, (count - readd));
114-
session->status = NC_STATUS_INVALID;
115-
session->term_reason = NC_SESSION_TERM_DROPPED;
116-
return -1;
117112
}
118113
break;
119114

@@ -138,8 +133,6 @@ nc_read(struct nc_session *session, char *buf, uint32_t count, uint32_t inact_ti
138133
return -1;
139134
}
140135
break;
141-
} else if ((uint32_t) res > (count - readd)) {
142-
return -1;
143136
} else {
144137
r = (ssize_t) res;
145138
}
@@ -632,9 +625,6 @@ nc_write(struct nc_session *session, const void *buf, uint32_t count)
632625
} else if (c < 0) {
633626
ERR(session, "Socket error (%s).", strerror(errno));
634627
return -1;
635-
} else if (c > (count - written)) {
636-
ERR(session, "invalid number of bytes written (%ld > %u).", c, (count - written));
637-
return -1;
638628
}
639629
break;
640630

@@ -968,10 +958,8 @@ nc_write_msg_io(struct nc_session *session, int io_timeout, int type, ...)
968958

969959
switch (reply->type) {
970960
case NC_RPL_OK:
971-
if ((reply_envp == NULL) || (rpc_envp == NULL) || lyd_new_opaq2(reply_envp, NULL, "ok", NULL, rpc_envp->name.prefix, rpc_envp->name.module_ns, NULL)) {
972-
if (reply_envp != NULL) {
973-
lyd_free_tree(reply_envp);
974-
}
961+
assert(rpc_envp != NULL);
962+
if (lyd_new_opaq2(reply_envp, NULL, "ok", NULL, rpc_envp->name.prefix, rpc_envp->name.module_ns, NULL)) {
975963

976964
ERRINT;
977965
ret = NC_MSG_ERROR;

0 commit comments

Comments
 (0)