jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

opr: replace AFS_STRINGIZE with opr_stringize

Browse Source 
To avoid adding new includes for afs/afsutil.h in order to use
'AFS_STRINGIZE', create a replacement, 'opr_stringize', in afs/opr.h.

Replace the usage of 'AFS_STRINGIZE' with opr_stringize and remove the
definition of 'AFS_STRINGIZE'

Change-Id: I6d12ed101b6f9246a59c46024c216c7fe25bc1c8
Reviewed-on: https://gerrit.openafs.org/15029
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Cheyenne Wills 2022-06-21 09:50:41 -06:00 committed by Benjamin Kaduk
parent 748ae0fc25
commit 7f54bbe156
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/afsd/afsd_kernel.c
View File

@ -9,6 +9,7 @@
#include <afsconfig.h> #include <afsconfig.h>
#include <afs/param.h> #include <afs/param.h>
#include <afs/opr.h>
#include <roken.h> #include <roken.h>
@ -77,8 +78,6 @@
#include <afs/afs_args.h> #include <afs/afs_args.h>
#include <afs/cellconfig.h> #include <afs/cellconfig.h>
#include <afs/afssyscalls.h> #include <afs/afssyscalls.h>
#include <afs/afsutil.h>
#ifdef AFS_DARWIN_ENV #ifdef AFS_DARWIN_ENV
#ifdef AFS_DARWIN80_ENV #ifdef AFS_DARWIN80_ENV
#include <sys/xattr.h> #include <sys/xattr.h>
@ -346,7 +345,7 @@ afsd_call_syscall(struct afsd_syscall_args *args)
const char *syscall_str; const char *syscall_str;
#if defined(AFS_SYSCALL) #if defined(AFS_SYSCALL)
syscall_str = AFS_STRINGIZE(AFS_SYSCALL); syscall_str = opr_stringize(AFS_SYSCALL);
#else #else
syscall_str = "[AFS_SYSCALL]"; syscall_str = "[AFS_SYSCALL]";
#endif #endif

5
src/opr/opr.h
View File

@ -9,6 +9,11 @@
/* assert.c */ /* assert.c */
/* A simple macro to help show the value of #define'd constants. e.g. If 'FOO'
* is defined as 5, then opr_stringize(FOO) expands to "5" */
#define opr_stringize_(s) #s
#define opr_stringize(s) opr_stringize_(s)
#ifdef AFS_NT40_ENV #ifdef AFS_NT40_ENV
# define opr_abort() opr_NTAbort() # define opr_abort() opr_NTAbort()
extern void opr_NTAbort(void); extern void opr_NTAbort(void);

5
src/util/afsutil.h
View File

@ -121,11 +121,6 @@ extern int re_exec(const char *p1);
/* b64_string_t is 8 bytes, in stds.h */ /* b64_string_t is 8 bytes, in stds.h */
typedef char lb64_string_t[12]; typedef char lb64_string_t[12];
/* A simple macro to help show the value of #define'd constants. e.g. If 'FOO'
* is defined as 5, then AFS_STRINGIZE(FOO) expands to "5" */
#define AFS_STRINGIZE_(s) #s
#define AFS_STRINGIZE(s) AFS_STRINGIZE_(s)
#include <afs/ktime.h> #include <afs/ktime.h>
#include "afsutil_prototypes.h" #include "afsutil_prototypes.h"