OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-270-gdf7f841

Gerrit Code Review gerrit@openafs.org
Thu, 22 Jun 2023 12:28:45 -0400


The following commit has been merged in the master branch:
commit df7f841f3852b5417a1d4ebc981780f2d7651b60
Author: Cheyenne Wills <cwills@sinenomine.net>
Date:   Thu May 25 15:51:10 2023 -0600

    clang: Don't redefine printf in salvage.c
    
    The Gentoo distribution changed the default fortify_source setting for
    clang (to match the default being used for gcc).  This change causes the
    following build error:
    
        src/dir/salvage.c:26:9: error: 'printf' macro redefined
            [-Werror,-Wmacro-redefined]
                ^
        /usr/include/bits/stdio2.h:89:11: note: previous definition is here
              ^
        1 error generated.
    
    If the fortify_source level is greater than 1, glibc can define printf
    as a macro.  The clang compiler has a default check for macro
    redefinitions (-Wmacro-redefined), while gcc does not provide this
    option.
    
    Remove the:
       #define printf Log
    in src/dir/salvage.c and update callers to use Log() instead of
    printf().
    
    Clean up lines that split the call to Log and its first parameter.  Fix
    the indentation for Log's parameters.
    
    There are no functional changes with this commit.
    
    Change-Id: I732c8345dfd4cf140883bff4b53df9ab9bea5a85
    Reviewed-on: https://gerrit.openafs.org/15462
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

 src/dir/salvage.c | 94 ++++++++++++++++++++++---------------------------------
 1 file changed, 38 insertions(+), 56 deletions(-)

-- 
OpenAFS Master Repository