OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_66-70-g36524b2
Gerrit Code Review
gerrit@openafs.org
Tue, 17 Nov 2009 13:13:21 -0800 (PST)
The following commit has been merged in the master branch:
commit 36524b2ed73a2774ee1f6242208a1395be7736a8
Author: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Fri Nov 13 09:50:29 2009 +0000
Rationalise our include paths
Our include paths are a bit of a mess. Fix these so that they're
more rational, and more in line with normal coding style.
In particular:
*) Don't include all of the subdirectories of our top level
include directory. If a file wants afs/file.h, it should
include that, not "file.h"
*) Try to avoid including '.' in the search path (although
objdir builds make this harder)
*) Don't blindly include other directories from the code tree
in the search path. If a package wants another packages header,
then it should get it from the include directory
*) Use the convention that quoted includes ("") pick up local
headers. Bracketed includes (<>) pick up ones from the top level
include dir
*) In directories which pull in files from multiple packages, don't
blindly put all of the package directories in the search path.
Specifically include the file's package directory when required
The big change here is that it's no longer possible to hide a system
include by placing a header of the same name in include/afs. The most
common case where this was happening was for 'assert.h'
Change-Id: I0796fabcf83ffcd74e533624c64e138a160dd632
Reviewed-on: http://gerrit.openafs.org/834
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
Makefile.in | 12 ++++++------
src/afsmonitor/afsmon-win.c | 22 +++++++++++-----------
src/afsmonitor/afsmonitor.c | 18 +++++++++---------
src/aklog/skipwrap.c | 2 +-
src/audit/Makefile.in | 2 +-
src/bucoord/volstub.c | 2 +-
src/comerr/Makefile.in | 7 +++----
src/config/Makefile.config.in | 5 ++++-
src/config/Makefile.in | 4 ++--
src/config/mc.c | 2 +-
src/des/Makefile.in | 4 ++++
src/des/cbc_encrypt.c | 4 ++--
src/des/cksum.c | 4 ++--
src/des/conf.h | 2 +-
src/des/debug_decl.c | 2 +-
src/des/des.c | 4 ++--
src/des/des.h | 2 +-
src/des/enc.c | 4 ++--
src/des/key_parity.c | 4 ++--
src/des/key_sched.c | 2 +-
src/des/main.c | 4 ++--
src/des/make_e.c | 2 +-
src/des/make_fp.c | 4 ++--
src/des/make_ip.c | 4 ++--
src/des/make_keyperm.c | 4 ++--
src/des/make_odd.c | 2 +-
src/des/make_p.c | 4 ++--
src/des/make_p_table.c | 4 ++--
src/des/make_s.c | 2 +-
src/des/make_s_table.c | 4 ++--
src/des/misc.c | 4 ++--
src/des/new_rnd_key.c | 4 ++--
src/des/pcbc_encrypt.c | 4 ++--
src/des/quad_cksum.c | 4 ++--
src/des/read_pssword.c | 4 ++--
src/des/strng_to_key.c | 4 ++--
src/des/util.c | 2 +-
src/fsprobe/fsprobe.c | 2 +-
src/fsprobe/fsprobe_test.c | 2 +-
src/kauth/kaaux.c | 2 +-
src/kauth/user.c | 4 ++--
src/libadmin/kas/Makefile.in | 2 +-
src/libafsauthent/Makefile.in | 36 ++++++++++++++++++------------------
src/libafsrpc/Makefile.in | 33 ++++++++++++++++-----------------
src/rxdebug/rxdebug.c | 10 +++++-----
src/rxkad/Makefile.in | 2 +-
src/rxkad/domestic/crypt_conn.c | 2 +-
src/rxkad/domestic/fcrypt.c | 2 +-
src/rxkad/rxkad.p.h | 2 +-
src/rxkad/v5gen.c | 2 +-
src/scout/scout.c | 22 +++++++++++-----------
src/shlibafsrpc/Makefile.in | 8 +++-----
src/sys/Makefile.in | 2 +-
src/tsalvaged/Makefile.in | 2 +-
src/tsalvaged/salvsync-debug.c | 18 +++++++++---------
src/tviced/Makefile.in | 10 +++++-----
src/tvolser/Makefile.in | 14 +++++++-------
src/ubik/Makefile.in | 2 +-
src/usd/Makefile.in | 2 +-
src/uss/Makefile.in | 3 +--
src/viced/Makefile.in | 5 ++---
src/viced/callback.c | 2 +-
src/viced/viced.c | 2 +-
src/vlserver/vldbint.xg | 2 +-
src/vol/nuke.c | 1 -
src/vol/physio.c | 4 ++--
src/vol/volume.c | 2 +-
src/volser/vol-dump.c | 24 ++++++++++++------------
src/volser/vol_split.c | 16 ++++++++--------
src/volser/volmain.c | 1 -
src/xstat/xstat_cm_test.c | 2 +-
src/xstat/xstat_fs_test.c | 2 +-
72 files changed, 207 insertions(+), 208 deletions(-)
--
OpenAFS Master Repository