From ba0527d4cad6ce4e2b153c553ce87dd0a2c4c353 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Fri, 19 May 2023 07:57:36 +0100
Subject: [PATCH] build: revert -Wmaybe-uninitialized warnings avoidance

This reverts commit 800c86d5, as that was deemed too invasive.
We do keep the change to tee.c to allow using -O3 without warnings.
For other optimization options like -O0, -Og, -O1, -Os,
one can use WERROR_CFLAGS= to stop warnings inducing a build failure.
---
 src/copy.c   | 4 ++--
 src/cp.c     | 2 +-
 src/digest.c | 3 ---
 src/head.c   | 2 +-
 src/ln.c     | 2 +-
 src/paste.c  | 2 +-
 src/pr.c     | 2 +-
 src/sort.c   | 2 +-
 8 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/copy.c b/src/copy.c
index 6b2cf3b29a..0dd059d2e4 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1238,8 +1238,8 @@ copy_reg (char const *src_name, char const *dst_name,
           struct stat const *src_sb)
 {
   char *buf = NULL;
-  int dest_desc IF_LINT ( = -1);
-  int dest_errno IF_LINT ( = 0);
+  int dest_desc;
+  int dest_errno;
   int source_desc;
   mode_t src_mode = src_sb->st_mode;
   mode_t extra_permissions;
diff --git a/src/cp.c b/src/cp.c
index c952eb397a..619eb8260a 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -441,7 +441,7 @@ make_dir_parents_private (char const *const_dir, size_t src_offset,
 
       while ((slash = strchr (slash, '/')))
         {
-          struct dir_attr *new IF_LINT ( = NULL);
+          struct dir_attr *new;
           bool missing_dir;
 
           *slash = '\0';
diff --git a/src/digest.c b/src/digest.c
index 6d9cc2a5b4..ab32968db7 100644
--- a/src/digest.c
+++ b/src/digest.c
@@ -1125,9 +1125,6 @@ hex_equal (unsigned char const *hex_digest, unsigned char const *bin_buffer)
   return cnt == digest_bin_bytes;
 }
 
-#if defined __GNUC__ && (__GNUC__ + (__GNUC_MINOR__ >= 7) > 4)
-# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif
 static bool
 digest_check (char const *checkfile_name)
 {
diff --git a/src/head.c b/src/head.c
index f576a2200c..c9d3b0d050 100644
--- a/src/head.c
+++ b/src/head.c
@@ -351,7 +351,7 @@ elide_tail_bytes_pipe (char const *filename, int fd, uintmax_t n_elide_0,
          bytes.  Then, for each new buffer we read, also write an old one.  */
 
       bool eof = false;
-      size_t n_read IF_LINT ( = 0);
+      size_t n_read;
       bool buffered_enough;
       size_t i, i_next;
       char **b = NULL;
diff --git a/src/ln.c b/src/ln.c
index bfdac0cd9c..1c3307cac9 100644
--- a/src/ln.c
+++ b/src/ln.c
@@ -473,7 +473,7 @@ main (int argc, char **argv)
   char const *backup_suffix = NULL;
   char *version_control_string = NULL;
   char const *target_directory = NULL;
-  int destdir_fd IF_LINT ( = -1);
+  int destdir_fd;
   bool no_target_directory = false;
   int n_files;
   char **file;
diff --git a/src/paste.c b/src/paste.c
index 468ef3ab03..5c194d8fe2 100644
--- a/src/paste.c
+++ b/src/paste.c
@@ -233,7 +233,7 @@ paste_parallel (size_t nfiles, char **fnamptr)
 
       for (size_t i = 0; i < nfiles && files_open; i++)
         {
-          int chr IF_LINT ( = -1);	/* Input character. */
+          int chr;			/* Input character. */
           int err;			/* Input errno value.  */
           bool sometodo = false;	/* Input chars to process.  */
 
diff --git a/src/pr.c b/src/pr.c
index 6be5b1f33a..1c32e8c81d 100644
--- a/src/pr.c
+++ b/src/pr.c
@@ -2428,7 +2428,7 @@ static bool
 read_line (COLUMN *p)
 {
   int c;
-  int chars IF_LINT ( =0);
+  int chars;
   int last_input_position;
   int j, k;
   COLUMN *q;
diff --git a/src/sort.c b/src/sort.c
index 5aadc797b7..8ca7a88c48 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -1045,7 +1045,7 @@ pipe_fork (int pipefds[2], size_t tries)
   struct tempnode *saved_temphead;
   int saved_errno;
   double wait_retry = 0.25;
-  pid_t pid IF_LINT ( = -1);
+  pid_t pid;
   struct cs_status cs;
 
   if (pipe2 (pipefds, O_CLOEXEC) < 0)
-- 
2.47.2