test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 20:18:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

format code

Browse Source
This commit is contained in:
xianjimli 2020-09-09 11:18:41 +08:00
parent 9f8409b98a
commit fee05fd1ff
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tkc/istream.c
View File

@ -173,19 +173,20 @@ ret_t tk_istream_read_line_str(tk_istream_t* stream, str_t* str) {
int32_t size = 0;
bool_t got_end_line = FALSE;
return_value_if_fail(stream != NULL && str != NULL, RET_BAD_PARAMS);
return_value_if_fail(stream->tell != NULL && stream->seek != NULL && stream->eos != NULL, RET_BAD_PARAMS);
return_value_if_fail(stream->tell != NULL && stream->seek != NULL && stream->eos != NULL,
RET_BAD_PARAMS);
str_set(str, "");
if(tk_istream_eos(stream)) {
if (tk_istream_eos(stream)) {
return RET_DONE;
}
while(!tk_istream_eos(stream) && got_end_line == FALSE) {
size = tk_istream_read(stream, line, sizeof(line)-1);
if(size >= 0) {
while (!tk_istream_eos(stream) && got_end_line == FALSE) {
size = tk_istream_read(stream, line, sizeof(line) - 1);
if (size >= 0) {
int32_t i = 0;
for(i = 0; i < size; i++) {
if(line[i] == '\r' || line[i] == '\n') {
for (i = 0; i < size; i++) {
if (line[i] == '\r' || line[i] == '\n') {
got_end_line = TRUE;
break;
}
@ -197,16 +198,16 @@ ret_t tk_istream_read_line_str(tk_istream_t* stream, str_t* str) {
continue;
}
if(line[i] == '\r') {
if (line[i] == '\r') {
i++;
if(line[i] == '\n') {
if (line[i] == '\n') {
i++;
}
} else if(line[i] == '\n') {
} else if (line[i] == '\n') {
i++;
}
if(i < size) {
if (i < size) {
int32_t pos = tk_istream_tell(stream);
pos = pos - (size - i);
ENSURE(tk_istream_seek(stream, pos) == RET_OK);
@ -218,4 +219,3 @@ ret_t tk_istream_read_line_str(tk_istream_t* stream, str_t* str) {
return RET_OK;
}

5
tests/istream_file_test.cc
View File

@ -3,7 +3,6 @@
#include "gtest/gtest.h"
#include "streams/file/istream_file.h"
TEST(IStreamFile, readline) {
str_t str;
tk_istream_t* is = tk_istream_file_create("tests/testdata/test_lines.txt");
@ -22,7 +21,9 @@ TEST(IStreamFile, readline) {
ASSERT_STREQ(str.str, "line4");
ASSERT_EQ(tk_istream_read_line_str(is, &str), RET_OK);
ASSERT_STREQ(str.str, "line5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
ASSERT_STREQ(str.str,
"line5xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
"xxxxxxxxxxxxxxxxxxx");
ASSERT_NE(tk_istream_read_line_str(is, &str), RET_OK);

1
tests/istream_mem_test.cc
View File

@ -101,4 +101,3 @@ TEST(IStreamMem, read_line) {
object_unref(OBJECT(is));
}