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

quorum.h (quorum_set_quorate_fn_t): make first param const

* exec/quorum.h (sync_callback_fn_t):
* exec/sync.c (current_members_cnt, sync_primary_callback_fn):
* exec/sync.h (name):
* exec/vsf_quorum.c (sync_primary_callback_fn):
(quorum_api_set_quorum):
* exec/vsf_ykd.c (ykd_primary_callback_fn):
* include/corosync/engine/coroapi.h (sync_callback_fn_t):
* include/corosync/engine/quorum.h (quorum_set_quorate_fn_t):

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2022 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering 17 лет назад
Родитель
Сommit
db4838bc35
7 измененных файлов с 12 добавлено и 12 удалено
  1. 1 1
      exec/quorum.h
  2. 2 2
      exec/sync.c
  3. 2 2
      exec/sync.h
  4. 3 3
      exec/vsf_quorum.c
  5. 1 1
      exec/vsf_ykd.c
  6. 2 2
      include/corosync/engine/coroapi.h
  7. 1 1
      include/corosync/engine/quorum.h

+ 1 - 1
exec/quorum.h

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
  *
  *
  * All rights reserved.
  * All rights reserved.
  *
  *

+ 2 - 2
exec/sync.c

@@ -281,8 +281,8 @@ int sync_register (
 
 
 
 
 static void sync_primary_callback_fn (
 static void sync_primary_callback_fn (
-	unsigned int *view_list,
-	int view_list_entries,
+	const unsigned int *view_list,
+	size_t view_list_entries,
 	int primary_designated,
 	int primary_designated,
 	struct memb_ring_id *ring_id)
 	struct memb_ring_id *ring_id)
 {
 {

+ 2 - 2
exec/sync.h

@@ -6,7 +6,7 @@
  * Author: Steven Dake (sdake@redhat.com)
  * Author: Steven Dake (sdake@redhat.com)
  *
  *
  * This software licensed under BSD license, the text of which follows:
  * This software licensed under BSD license, the text of which follows:
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  * modification, are permitted provided that the following conditions are met:
  *
  *
@@ -59,7 +59,7 @@ int sync_primary_designated (void);
 /**
 /**
  * Execute synchronization upon request for the named service
  * Execute synchronization upon request for the named service
  * @param name service handler name to synchronize
  * @param name service handler name to synchronize
- * 
+ *
  * @return int 0 OK, error code otherwise
  * @return int 0 OK, error code otherwise
  */
  */
 extern int sync_request (char *name);
 extern int sync_request (char *name);

+ 3 - 3
exec/vsf_quorum.c

@@ -100,13 +100,13 @@ static int quorum_view_list[PROCESSOR_COUNT_MAX];
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 struct quorum_services_api_ver1 *quorum_iface = NULL;
 
 
 static void (*sync_primary_callback_fn) (
 static void (*sync_primary_callback_fn) (
-	unsigned int *view_list,
-	int view_list_entries,
+	const unsigned int *view_list,
+	size_t view_list_entries,
 	int primary_designated,
 	int primary_designated,
 	struct memb_ring_id *ring_id);
 	struct memb_ring_id *ring_id);
 
 
 /* Internal quorum API function */
 /* Internal quorum API function */
-static void quorum_api_set_quorum(unsigned int *view_list,
+static void quorum_api_set_quorum(const unsigned int *view_list,
 				  size_t view_list_entries,
 				  size_t view_list_entries,
 				  int quorum, struct memb_ring_id *ring_id)
 				  int quorum, struct memb_ring_id *ring_id)
 {
 {

+ 1 - 1
exec/vsf_ykd.c

@@ -145,7 +145,7 @@ static void *ykd_state_send_callback_token_handle = 0;
 static struct corosync_api_v1 *api;
 static struct corosync_api_v1 *api;
 
 
 static void (*ykd_primary_callback_fn) (
 static void (*ykd_primary_callback_fn) (
-	unsigned int *view_list,
+	const unsigned int *view_list,
 	size_t view_list_entries,
 	size_t view_list_entries,
 	int primary_designated,
 	int primary_designated,
 	struct memb_ring_id *ring_id) = NULL;
 	struct memb_ring_id *ring_id) = NULL;

+ 2 - 2
include/corosync/engine/coroapi.h

@@ -209,8 +209,8 @@ struct quorum_callin_functions
 };
 };
 
 
 typedef void (*sync_callback_fn_t) (
 typedef void (*sync_callback_fn_t) (
-	unsigned int *view_list,
-	int view_list_entries,
+	const unsigned int *view_list,
+	size_t view_list_entries,
 	int primary_designated,
 	int primary_designated,
 	struct memb_ring_id *ring_id);
 	struct memb_ring_id *ring_id);
 
 

+ 1 - 1
include/corosync/engine/quorum.h

@@ -35,7 +35,7 @@
 #ifndef QUORUM_H_DEFINED
 #ifndef QUORUM_H_DEFINED
 #define QUORUM_H_DEFINED
 #define QUORUM_H_DEFINED
 
 
-typedef void (*quorum_set_quorate_fn_t) (unsigned int *view_list,
+typedef void (*quorum_set_quorate_fn_t) (const unsigned int *view_list,
 					 size_t view_list_entries,
 					 size_t view_list_entries,
 					 int quorate, struct memb_ring_id *);
 					 int quorate, struct memb_ring_id *);