proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-31 06:16:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libqb: use the new cs_strerror() to print out the error message.

Browse Source 
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
This commit is contained in:
Angus Salkeld 2010-12-14 13:05:49 +11:00
parent 75a16ee20e
commit f55b23eaa9
1 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tools/corosync-objctl.c
View File

@ -44,6 +44,7 @@
#include <sys/types.h>
#include <sys/un.h>
#include "../lib/util.h"
#include <corosync/corotypes.h>
#include <corosync/confdb.h>
@ -192,17 +193,18 @@ static void print_config_tree(confdb_handle_t handle, hdb_handle_t parent_object
/* Show the keys */
res = confdb_key_iter_start(handle, parent_object_handle);
if (res != CS_OK) {
fprintf(stderr, "error resetting key iterator for object "HDB_X_FORMAT" %d\n", parent_object_handle, res);
fprintf(stderr, "error resetting key iterator for object "HDB_X_FORMAT" %s\n",
parent_object_handle, cs_strerror(res));
exit(EXIT_FAILURE);
}
children_printed = 0;
while ( (res = confdb_key_iter_typed(handle,
parent_object_handle,
key_name,
key_value,
&key_value_len,
&type)) == CS_OK) {
parent_object_handle,
key_name,
key_value,
&key_value_len,
&type)) == CS_OK) {
key_value[key_value_len] = '\0';
if (parent_name != NULL)
printf("%s%c", parent_name, SEPERATOR);
@ -215,7 +217,8 @@ static void print_config_tree(confdb_handle_t handle, hdb_handle_t parent_object
/* Show sub-objects */
res = confdb_object_iter_start(handle, parent_object_handle);
if (res != CS_OK) {
fprintf(stderr, "error resetting object iterator for object "HDB_X_FORMAT" %d\n", parent_object_handle, res);
fprintf(stderr, "error resetting object iterator for "HDB_X_FORMAT" %s\n",
parent_object_handle, cs_strerror(res));
exit(EXIT_FAILURE);
}
@ -323,7 +326,8 @@ static int print_all(void)
result = confdb_initialize (&handle, &callbacks);
if (result != CS_OK) {
fprintf (stderr, "Could not initialize objdb library. Error %d\n", result);
fprintf (stderr, "Could not initialize objdb library: %s\n",
cs_strerror(result));
return 1;
}
@ -439,7 +443,8 @@ static cs_error_t find_object (confdb_handle_t handle,
while (obj_name_pt != NULL) {
res = confdb_object_find_start(handle, parent_object_handle);
if (res != CS_OK) {
fprintf (stderr, "Could not start object_find %d\n", res);
fprintf (stderr, "Could not start object_find %s\n",
cs_strerror(res));
exit (EXIT_FAILURE);
}
@ -519,7 +524,8 @@ static void write_key(confdb_handle_t handle, char * path_pt)
strlen(key_value));
if (res != CS_OK)
fprintf(stderr, "Failed to replace the key %s=%s. Error %d\n", key_name, key_value, res);
fprintf(stderr, "Failed to replace the key %s=%s. Error %s\n",
key_name, key_value, cs_strerror(res));
} else {
/* not there, create a new key */
res = confdb_key_create_typed (handle,
@ -529,7 +535,8 @@ static void write_key(confdb_handle_t handle, char * path_pt)
strlen(key_value),
CONFDB_VALUETYPE_STRING);
if (res != CS_OK)
fprintf(stderr, "Failed to create the key %s=%s. Error %d\n", key_name, key_value, res);
fprintf(stderr, "Failed to create the key %s=%s. Error %s\n",
key_name, key_value, cs_strerror(res));
}
}
@ -550,7 +557,8 @@ static void create_object(confdb_handle_t handle, char * name_pt)
while (obj_name_pt != NULL) {
res = confdb_object_find_start(handle, parent_object_handle);
if (res != CS_OK) {
fprintf (stderr, "Could not start object_find %d\n", res);
fprintf (stderr, "Could not start object_find %s\n",
cs_strerror(res));
exit (EXIT_FAILURE);
}
@ -572,8 +580,8 @@ static void create_object(confdb_handle_t handle, char * name_pt)
strlen (obj_name_pt),
&obj_handle);
if (res != CS_OK)
fprintf(stderr, "Failed to create object \"%s\". Error %d.\n",
obj_name_pt, res);
fprintf(stderr, "Failed to create object \"%s\". Error %s.\n",
obj_name_pt, cs_strerror(res));
}
parent_object_handle = obj_handle;
@ -756,15 +764,15 @@ static void track_object(confdb_handle_t handle, char * name_pt)
res = find_object (handle, name_pt, FIND_OBJECT_ONLY, &obj_handle);
if (res != CS_OK) {
fprintf (stderr, "Could not find object \"%s\". Error %d\n",
name_pt, res);
fprintf (stderr, "Could not find object \"%s\". Error %s\n",
name_pt, cs_strerror(res));
return;
}
res = confdb_track_changes (handle, obj_handle, CONFDB_TRACK_DEPTH_RECURSIVE);
if (res != CS_OK) {
fprintf (stderr, "Could not enable tracking on object \"%s\". Error %d\n",
name_pt, res);
fprintf (stderr, "Could not enable tracking on object \"%s\". Error %s\n",
name_pt, cs_strerror(res));
return;
}
}
@ -775,7 +783,8 @@ static void stop_tracking(confdb_handle_t handle)
res = confdb_stop_track_changes (handle);
if (res != CS_OK) {
fprintf (stderr, "Could not stop tracking. Error %d\n", res);
fprintf (stderr, "Could not stop tracking. Error %s\n",
cs_strerror(res));
return;
}
}
@ -790,7 +799,8 @@ static void delete_object(confdb_handle_t handle, char * name_pt)
res = confdb_object_destroy (handle, obj_handle);
if (res != CS_OK)
fprintf(stderr, "Failed to find object \"%s\" to delete. Error %d\n", name_pt, res);
fprintf(stderr, "Failed to find object \"%s\" to delete. \n Error %s\n",
name_pt, cs_strerror(res));
} else {
char parent_name[OBJ_NAME_SIZE];
char key_name[OBJ_NAME_SIZE];
@ -802,20 +812,21 @@ static void delete_object(confdb_handle_t handle, char * name_pt)
res = find_object (handle, parent_name, FIND_OBJECT_ONLY, &obj_handle);
if (res != CS_OK) {
fprintf(stderr, "Failed to find the key's parent object \"%s\". Error %d\n", parent_name, res);
fprintf(stderr, "Failed to find the key's parent object \"%s\". Error %s\n",
parent_name, cs_strerror(res));
exit (EXIT_FAILURE);
}
res = confdb_key_delete (handle,
obj_handle,
key_name,
strlen(key_name),
key_value,
strlen(key_value));
obj_handle,
key_name,
strlen(key_name),
key_value,
strlen(key_value));
if (res != CS_OK)
fprintf(stderr, "Failed to delete key \"%s=%s\" from object \"%s\". Error %d\n",
key_name, key_value, parent_name, res);
fprintf(stderr, "Failed to delete key \"%s=%s\" from object \"%s\".\n Error %s\n",
key_name, key_value, parent_name, cs_strerror(res));
}
}
@ -881,7 +892,8 @@ int main (int argc, char *argv[]) {
result = confdb_initialize (&handle, &callbacks);
if (result != CS_OK) {
fprintf (stderr, "Failed to initialize the objdb API. Error %d\n", result);
fprintf (stderr, "Failed to initialize the objdb API. Error %s\n",
cs_strerror(result));
exit (EXIT_FAILURE);
}
while (optind < argc) {
@ -914,7 +926,8 @@ int main (int argc, char *argv[]) {
result = confdb_finalize (handle);
if (result != CS_OK) {
fprintf (stderr, "Error finalizing objdb API. Error %d\n", result);
fprintf (stderr, "Error finalizing objdb API.\n Error %s\n",
cs_strerror(result));
exit(EXIT_FAILURE);
}