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

confdb.h (confdb_key_change_notify_fn_t): Make 3 params "const"

* include/corosync/confdb.h (confdb_key_change_notify_fn_t):
Make 3 params const.
* tools/corosync-objctl.c (find_object_of_type_t, callbacks):
(tail_key_changed): Don't write into would-be-const members.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1999 fd59a12c-fef9-0310-b244-a6a79926bd2f
Jim Meyering 17 лет назад
Родитель
Сommit
1701b32f1d
2 измененных файлов с 15 добавлено и 19 удалено
  1. 4 4
      include/corosync/confdb.h
  2. 11 15
      tools/corosync-objctl.c

+ 4 - 4
include/corosync/confdb.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2008, 2009 Red Hat, Inc.
  *
  * All rights reserved.
  *
@@ -62,11 +62,11 @@ typedef void (*confdb_key_change_notify_fn_t) (
 	confdb_change_type_t change_type,
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	void *object_name,
+	const void *object_name,
 	int  object_name_len,
-	void *key_name,
+	const void *key_name,
 	int key_name_len,
-	void *key_value,
+	const void *key_value,
 	int key_value_len);
 
 typedef void (*confdb_object_create_notify_fn_t) (

+ 11 - 15
tools/corosync-objctl.c

@@ -71,11 +71,11 @@ static void tail_key_changed(confdb_handle_t handle,
 	confdb_change_type_t change_type,
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	void *object_name,
+	const void *object_name,
 	int  object_name_len,
-	void *key_name,
+	const void *key_name,
 	int key_name_len,
-	void *key_value,
+	const void *key_value,
 	int key_value_len);
 
 static void tail_object_created(confdb_handle_t handle,
@@ -89,7 +89,7 @@ static void tail_object_deleted(confdb_handle_t handle,
 	uint8_t *name_pt,
 	int  name_len);
 
-confdb_callbacks_t callbacks = {
+static confdb_callbacks_t callbacks = {
 	.confdb_key_change_notify_fn = tail_key_changed,
 	.confdb_object_create_change_notify_fn = tail_object_created,
 	.confdb_object_delete_change_notify_fn = tail_object_deleted,
@@ -394,21 +394,17 @@ static void tail_key_changed(confdb_handle_t handle,
 	confdb_change_type_t change_type,
 	hdb_handle_t parent_object_handle,
 	hdb_handle_t object_handle,
-	void *object_name_pt,
+	const void *object_name_pt,
 	int  object_name_len,
-	void *key_name_pt,
+	const void *key_name_pt,
 	int key_name_len,
-	void *key_value_pt,
+	const void *key_value_pt,
 	int key_value_len)
 {
-	char * on = (char*)object_name_pt;
-	char * kn = (char*)key_name_pt;
-	char * kv = (char*)key_value_pt;
-
-	on[object_name_len] = '\0';
-	kv[key_value_len] = '\0';
-	kn[key_name_len] = '\0';
-	printf("key_changed> %s.%s=%s\n", on, kn, kv);
+	printf("key_changed> %.*s.%.*s=%.*s\n",
+	       object_name_len, (const char *)object_name_pt,
+	       key_name_len, (const char *)key_value_pt,
+	       key_value_len, (const char *)key_value_pt);
 }
 
 static void tail_object_created(confdb_handle_t handle,