From daed548f70a2187c679232e4f79d703389419c4e 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.

Change-Id: Ida606fccebcb4edfed706405424ff3ee4858020f
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>
---
 src/ptserver/Makefile.in          | 6 +++---
 src/ptserver/NTMakefile           | 2 +-
 src/ptserver/{ubik.c => ptubik.c} | 0
 src/tptserver/Makefile.in         | 8 ++++----
 src/tptserver/NTMakefile          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename src/ptserver/{ubik.c => ptubik.c} (100%)

diff --git a/src/ptserver/Makefile.in b/src/ptserver/Makefile.in
index aa0c3a496..3d018e812 100644
--- a/src/ptserver/Makefile.in
+++ b/src/ptserver/Makefile.in
@@ -205,11 +205,11 @@ 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)
-	$(AFS_LDRULE) pt_util.o ptutils.o ubik.o utils.o map.o libprot.a \
+pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o libprot.a $(LIBS)
+	$(AFS_LDRULE) pt_util.o ptutils.o ptubik.o utils.o map.o libprot.a \
 		${TOP_LIBDIR}/libcmd.a $(LIBS) $(LIB_roken) ${XLIBS}
 
-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 9e5e49d8c..bc5846e9c 100644
--- a/src/ptserver/NTMakefile
+++ b/src/ptserver/NTMakefile
@@ -105,7 +105,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 97910d3d2..5a217c602 100644
--- a/src/tptserver/Makefile.in
+++ b/src/tptserver/Makefile.in
@@ -136,15 +136,15 @@ testpt: testpt.o $(LIBS_client)
 testpt.o: ${PTSERVER}/testpt.c ${INCLS}
 	$(AFS_CCRULE) $(PTSERVER)/testpt.c
 
-pt_util: pt_util.o ptutils.o ubik.o utils.o map.o $(LIBS_client)
-	$(LT_LDRULE_static) pt_util.o ptutils.o ubik.o utils.o map.o \
+pt_util: pt_util.o ptutils.o ptubik.o utils.o map.o $(LIBS_client)
+	$(LT_LDRULE_static) pt_util.o ptutils.o ptubik.o utils.o map.o \
 		$(LIBS_client) $(LIB_hcrypto) $(LIB_roken) ${MT_LIBS} ${XLIBS}
 
 pt_util.o: ${PTSERVER}/pt_util.c
 	$(AFS_CCRULE) $(PTSERVER)/pt_util.c
 
-ubik.o: ${PTSERVER}/ubik.c ${INCLS}
-	$(AFS_CCRULE) $(PTSERVER)/ubik.c
+ptubik.o: ${PTSERVER}/ptubik.c ${INCLS}
+	$(AFS_CCRULE) $(PTSERVER)/ptubik.c
 
 pterror.h: pterror.c
 pterror.c: ${PTSERVER}/pterror.et
diff --git a/src/tptserver/NTMakefile b/src/tptserver/NTMakefile
index b23134424..f53592367 100644
--- a/src/tptserver/NTMakefile
+++ b/src/tptserver/NTMakefile
@@ -130,7 +130,7 @@ PTCLIENT_EXERES = $(OUT)\ptclient.res
 
 PT_UTIL_EXEOBJS = \
         $(OUT)\pt_util.obj \
-        $(OUT)\ubik.obj
+        $(OUT)\ptubik.obj
 
 $(PT_UTIL_EXEOBJS): $(SRC_DIR)\$$(@B).c
         $(C2OBJ) -I$(SRC_DIR) $**
-- 
2.39.5