Skip to content

Commit 7f7465a

Browse files
committed
Move test if zlog stream is finished to zlog_stream_str
1 parent 9f042f0 commit 7f7465a

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

sapi/fpm/fpm/zlog.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,6 @@ static ssize_t zlog_stream_buf_append(struct zlog_stream *stream, const char *st
354354
{
355355
int finished = 0;
356356

357-
if (stream->finished) {
358-
return 0;
359-
}
360-
361357
if (stream->len + len > zlog_limit) {
362358
stream->finished = finished = 1;
363359
len = zlog_limit - stream->len;
@@ -383,10 +379,6 @@ static inline ssize_t zlog_stream_write(struct zlog_stream *stream, const char *
383379
const char *append;
384380
size_t append_len;
385381

386-
if (stream->finished) {
387-
return 0;
388-
}
389-
390382
if (stream->len + len >= zlog_limit) {
391383
stream->finished = finished = 1;
392384
append = (stream->len + len == zlog_limit) ? "\n" : "...\n";
@@ -490,6 +482,10 @@ ssize_t zlog_stream_format(struct zlog_stream *stream, const char *fmt, ...) /*
490482

491483
ssize_t zlog_stream_str(struct zlog_stream *stream, const char *str, size_t str_len) /* {{{ */
492484
{
485+
if (stream->finished) {
486+
return 0;
487+
}
488+
493489
if (stream->use_buffer) {
494490
return zlog_stream_buf_append(stream, str, str_len);
495491
}

0 commit comments

Comments
 (0)