diff options
| -rw-r--r-- | xlators/features/changelog/lib/src/gf-changelog.c | 15 | ||||
| -rw-r--r-- | xlators/features/changelog/lib/src/gf-history-changelog.c | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c index f74d8effe95..0240aeb0086 100644 --- a/xlators/features/changelog/lib/src/gf-changelog.c +++ b/xlators/features/changelog/lib/src/gf-changelog.c @@ -307,7 +307,7 @@ gf_changelog_start_fresh () ssize_t gf_changelog_next_change (char *bufptr, size_t maxlen) { - ssize_t size = 0; + ssize_t size = -1; int tracker_fd = 0; xlator_t *this = NULL; gf_changelog_t *gfc = NULL; @@ -326,18 +326,19 @@ gf_changelog_next_change (char *bufptr, size_t maxlen) tracker_fd = gfc->gfc_fd; size = gf_readline (tracker_fd, buffer, maxlen); - if (size < 0) + if (size < 0) { + size = -1; goto out; + } + if (size == 0) - return 0; + goto out; memcpy (bufptr, buffer, size - 1); - *(buffer + size) = '\0'; + bufptr[size - 1] = '\0'; +out: return size; - - out: - return -1; } /** diff --git a/xlators/features/changelog/lib/src/gf-history-changelog.c b/xlators/features/changelog/lib/src/gf-history-changelog.c index a895037eeca..d1a6b0e9c89 100644 --- a/xlators/features/changelog/lib/src/gf-history-changelog.c +++ b/xlators/features/changelog/lib/src/gf-history-changelog.c @@ -147,7 +147,7 @@ gf_history_changelog_start_fresh () ssize_t gf_history_changelog_next_change (char *bufptr, size_t maxlen) { - ssize_t size = 0; + ssize_t size = -1; int tracker_fd = 0; xlator_t *this = NULL; gf_changelog_t *gfc = NULL; @@ -171,18 +171,19 @@ gf_history_changelog_next_change (char *bufptr, size_t maxlen) tracker_fd = hist_gfc->gfc_fd; size = gf_readline (tracker_fd, buffer, maxlen); - if (size < 0) + if (size < 0) { + size = -1; goto out; + } + if (size == 0) - return 0; + goto out; memcpy (bufptr, buffer, size - 1); - *(buffer + size) = '\0'; + bufptr[size - 1] = '\0'; +out: return size; - - out: - return -1; } /** |