From 5929f5c8b37dca26dcb289882ccbd9ea02746e50 Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 15 Aug 2022 12:29:19 +0000 Subject: [PATCH] Adjust whitespace (tabs vs spaces) on one line to reduce diff with upstream --- lib/libz/inflate.c | 4 ++-- sys/lib/libz/inflate.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libz/inflate.c b/lib/libz/inflate.c index e941ef62765..a197bb6f872 100644 --- a/lib/libz/inflate.c +++ b/lib/libz/inflate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inflate.c,v 1.13 2022/08/09 07:37:35 tb Exp $ */ +/* $OpenBSD: inflate.c,v 1.14 2022/08/15 12:29:19 tb Exp $ */ /* inflate.c -- zlib decompression * Copyright (C) 1995-2022 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -787,7 +787,7 @@ int flush; if (state->head != Z_NULL && state->head->extra != Z_NULL && (len = state->head->extra_len - state->length) < - state->head->extra_max) { + state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy); diff --git a/sys/lib/libz/inflate.c b/sys/lib/libz/inflate.c index 529670d268a..f35a99c4185 100644 --- a/sys/lib/libz/inflate.c +++ b/sys/lib/libz/inflate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inflate.c,v 1.19 2022/08/09 07:39:00 tb Exp $ */ +/* $OpenBSD: inflate.c,v 1.20 2022/08/15 12:29:19 tb Exp $ */ /* inflate.c -- zlib decompression * Copyright (C) 1995-2022 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h @@ -787,7 +787,7 @@ int flush; if (state->head != Z_NULL && state->head->extra != Z_NULL && (len = state->head->extra_len - state->length) < - state->head->extra_max) { + state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy); -- 2.20.1