Skip to content

Commit

Permalink
selftests/bpf: Variable naming fix
Browse files Browse the repository at this point in the history
Change log_fd to log_fp to reflect its type correctly.

Signed-off-by: Yucong Sun <sunyucong@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211112192535.898352-3-fallentree@fb.com
  • Loading branch information
Yucong Sun authored and Andrii Nakryiko committed Nov 17, 2021
1 parent ea78548 commit 67d61d3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions tools/testing/selftests/bpf/test_progs.c
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ static void *dispatch_thread(void *ctx)
{
struct dispatch_data *data = ctx;
int sock_fd;
FILE *log_fd = NULL;
FILE *log_fp = NULL;

sock_fd = data->sock_fd;

Expand Down Expand Up @@ -1002,8 +1002,8 @@ static void *dispatch_thread(void *ctx)

/* collect all logs */
if (msg_test_done.test_done.have_log) {
log_fd = open_memstream(&result->log_buf, &result->log_cnt);
if (!log_fd)
log_fp = open_memstream(&result->log_buf, &result->log_cnt);
if (!log_fp)
goto error;

while (true) {
Expand All @@ -1014,12 +1014,12 @@ static void *dispatch_thread(void *ctx)
if (msg_log.type != MSG_TEST_LOG)
goto error;

fprintf(log_fd, "%s", msg_log.test_log.log_buf);
fprintf(log_fp, "%s", msg_log.test_log.log_buf);
if (msg_log.test_log.is_last)
break;
}
fclose(log_fd);
log_fd = NULL;
fclose(log_fp);
log_fp = NULL;
}
/* output log */
{
Expand All @@ -1045,8 +1045,8 @@ static void *dispatch_thread(void *ctx)
if (env.debug)
fprintf(stderr, "[%d]: Protocol/IO error: %s.\n", data->worker_id, strerror(errno));

if (log_fd)
fclose(log_fd);
if (log_fp)
fclose(log_fp);
done:
{
struct msg msg_exit;
Expand Down

0 comments on commit 67d61d3

Please sign in to comment.