Просмотр исходного кода

Remove some warnings from the compile.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@724 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 20 лет назад
Родитель
Сommit
f617334946
4 измененных файлов с 7 добавлено и 10 удалено
  1. 6 5
      lib/Makefile
  2. 1 1
      lib/amf.c
  3. 0 2
      lib/ckpt.c
  4. 0 2
      lib/evs.c

+ 6 - 5
lib/Makefile

@@ -32,20 +32,17 @@
 #LDFLAGS = 
 
 # Debug mode flags
-CFLAGS = -g -DDEBUG -Wall -fPIC
+CFLAGS = -g -DDEBUG -Wall
 LDFLAGS = -g
 
 # Profile mode flags
-#CFLAGS = -O3 -pg -DDEBUG -fPIC
+#CFLAGS = -O3 -pg -DDEBUG
 #LDFLAGS = -pg
 
 # Code Coverage with lcov flgs
 #CFLAGS = -ftest-coverage -fprofile-arcs
 #LDFLAGS = -g
 
-
-CFLAGS += -fPIC
-
 all:libSaClm.a libSaClm.so.1.0 libSaAmf.a libSaAmf.so.1.0 libSaCkpt.a \
 	libSaCkpt.so.1.0 libSaEvt.a libSaEvt.so.1.0 libais.a libais.so.1.0 libevs.a \
 	libevs.so.1.0
@@ -113,6 +110,10 @@ clean:
 	rm -f *.o libais.so* libais.a libSaClm.so* libSaClm.a* libSaAmf.so* libSaAmf.a \
 		libSaCkpt.so* libSaCkpt.a* libSaEvt.so* libSaEvt.a libevs.so* libevs.a \
 		*.da *.bb *.bbg
+ 
+# -fPIC rules required for all libraries
+%.o: %.c
+	$(CC) $(CFLAGS) -fPIC -c -o $@ $(*F).c
 
 depend:
 	makedepend -Y -- $(CFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1

+ 1 - 1
lib/amf.c

@@ -110,7 +110,7 @@ saAmfInitialize (
 	struct amfInstance *amfInstance;
 	SaErrorT error = SA_OK;
 
-	error = saVersionVerify (&amfVersionDatabase, version);
+	error = saVersionVerify (&amfVersionDatabase, (SaVersionT *)version);
 	if (error != SA_OK) {
 		goto error_no_destroy;
 	}

+ 0 - 2
lib/ckpt.c

@@ -139,8 +139,6 @@ static struct saVersionDatabase ckptVersionDatabase = {
  */
 void ckptHandleInstanceDestructor (void *instance)
 {
-struct ckptInstance *ckptInstance = (struct ckptInstance *)instance;
-
 }
 
 void checkpointHandleInstanceDestructor (void *instance)

+ 0 - 2
lib/evs.c

@@ -569,12 +569,10 @@ evs_error_t evs_membership_get (
 	pthread_mutex_unlock (&evs_inst->response_mutex);
 
 	if (error != SA_OK) {
-	printf ("error\n");
 		goto error_exit;
 	}
 
 	error = res_lib_evs_membership_get.header.error;
-	printf ("members is %d\n", res_lib_evs_membership_get.member_list_entries);
 
 	/*
 	 * Copy results to caller