diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-01 18:35:16 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-06-02 08:07:44 -0400 |
commit | af87c7a1af8d790b819afe782fcff2830e959d58 (patch) | |
tree | af9b6fe9c85e1159679406abe82c2d61fe427705 | |
parent | Fix condition in peek_line (diff) | |
download | sway-af87c7a1af8d790b819afe782fcff2830e959d58.tar.gz sway-af87c7a1af8d790b819afe782fcff2830e959d58.tar.zst sway-af87c7a1af8d790b819afe782fcff2830e959d58.zip |
Address emersion's feedback on peek_line
-rw-r--r-- | common/readline.c | 8 | ||||
-rw-r--r-- | include/readline.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/readline.c b/common/readline.c index 4f55e99c..46b96623 100644 --- a/common/readline.c +++ b/common/readline.c | |||
@@ -49,11 +49,11 @@ char *read_line(FILE *file) { | |||
49 | return string; | 49 | return string; |
50 | } | 50 | } |
51 | 51 | ||
52 | char *peek_line(FILE *file, int offset, long *position) { | 52 | char *peek_line(FILE *file, int line_offset, long *position) { |
53 | long pos = ftell(file); | 53 | long pos = ftell(file); |
54 | size_t length = 1; | 54 | size_t length = 0; |
55 | char *line = calloc(1, length); | 55 | char *line = NULL; |
56 | for (int i = 0; i <= offset; i++) { | 56 | for (int i = 0; i <= line_offset; i++) { |
57 | ssize_t read = getline(&line, &length, file); | 57 | ssize_t read = getline(&line, &length, file); |
58 | if (read < 0) { | 58 | if (read < 0) { |
59 | break; | 59 | break; |
diff --git a/include/readline.h b/include/readline.h index e1ae2302..ee2eba5d 100644 --- a/include/readline.h +++ b/include/readline.h | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | 5 | ||
6 | char *read_line(FILE *file); | 6 | char *read_line(FILE *file); |
7 | char *peek_line(FILE *file, int offset, long *position); | 7 | char *peek_line(FILE *file, int line_offset, long *position); |
8 | char *read_line_buffer(FILE *file, char *string, size_t string_len); | 8 | char *read_line_buffer(FILE *file, char *string, size_t string_len); |
9 | 9 | ||
10 | #endif | 10 | #endif |