From 2c37afa50fd01e8208c55056895de0e140fad966 Mon Sep 17 00:00:00 2001
From: Simon Wilkinson <sxw@your-file-system.com>
Date: Tue, 26 Feb 2013 12:26:36 +0000
Subject: [PATCH] ptserver: Rename ubik.c as ptubik.c

Coverity gets confused between ubik/ubik.c and ptserver/ubik.c,
and produces a load of false positives. Rename the ptserver ubik
shim (which is only used by pt_util) in order to reduce this
confusion.

Reviewed-on: http://gerrit.openafs.org/9273
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit daed548f70a2187c679232e4f79d703389419c4e)

Change-Id: I834fab3b65859cb73ece3fc52d9272d0b7d452ed
Reviewed-on: http://gerrit.openafs.org/11012
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---
 src/ptserver/Makefile.in          | 6 +++---
 src/ptserver/NTMakefile           | 2 +-
 src/ptserver/{ubik.c => ptubik.c} | 0
 src/tptserver/Makefile.in         | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/ptserver/{ubik.c => ptubik.c} (100%)

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index d4663c8b2e..b836ef1f26 100644
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -189,10 +189,10 @@ testpt: testpt.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS)
 
 testpt.o: testpt.c ${INCLS} ${TOP_INCDIR}/afs/cmd.h AFS_component_version_number.c
 
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o libprot.a $(LIBS)
-	$(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} ${KRB5_LIBS}
+pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o libprot.a $(LIBS)
+	$(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ptubik.o utils.o map.o libprot.a ${TOP_LIBDIR}/libcmd.a $(LIBS) ${XLIBS} ${KRB5_LIBS}
 
-ubik.o: ubik.c ${INCLS}
+ptubik.o: ptubik.c ${INCLS}
 
 prerror.h: pterror.h
 	${INSTALL_DATA} $? $@
diff --git a/src/ptserver/NTMakefile b/src/ptserver/NTMakefile
index a5749f6cb8..9595b4175a 100644
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -102,7 +102,7 @@ PTCLIENT_EXEOBJS =\
 PT_UTIL_EXEOBJS = \
         $(OUT)\pt_util.obj \
         $(OUT)\ptutils.obj \
-        $(OUT)\ubik.obj \
+        $(OUT)\ptubik.obj \
         $(OUT)\utils.obj \
         $(OUT)\map.obj \
         $(OUT)\pt_util.res
diff --git a/src/ptserver/ubik.c b/src/ptserver/ptubik.c
similarity index 100%
rename from src/ptserver/ubik.c
rename to src/ptserver/ptubik.c
diff --git a/src/tptserver/Makefile.in b/src/tptserver/Makefile.in
index 40c75196d7..5a1f5d9ccd 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -202,14 +202,14 @@ testpt: testpt.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS)
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
 	${CCRULE} ${srcdir}/${PTSERVER}/testpt.c
 
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) $(LIBS)
-	$(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
+pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o $(PTOBJS) $(LIBS)
+	$(CC) ${CFLAGS} -o pt_util pt_util.o ptutils.o ptubik.o utils.o map.o $(PTOBJS) ${TOP_LIBDIR}/libcmd.a $(LIBS) ${MT_LIBS} ${XLIBS} ${KRB5_LIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
 	${CCRULE} ${srcdir}/${PTSERVER}/pt_util.c
 
-ubik.o: ${PTSERVER}/ubik.c ${INCLS}
-	${CCRULE} ${srcdir}/${PTSERVER}/ubik.c
+ptubik.o: ${PTSERVER}/ptubik.c ${INCLS}
+	${CCRULE} ${srcdir}/${PTSERVER}/ptubik.c
 
 prerror.h: pterror.h
 	${INSTALL} $? $@