proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-08-13 14:54:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Type checking changes for printf's

Browse Source 
(Logical change 1.98)


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@364 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2004-10-27 22:24:15 +00:00
parent 54c310f1a1
commit e2c260f251
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
exec/amf.c
View File

@ -815,7 +815,7 @@ void readinessStateSetApi (struct saAmfComponent *component,
res_lib_amf_readinessstatesetcallback.readinessState = readinessState;
component->newReadinessState = readinessState;
log_printf (LOG_LEVEL_DEBUG, "Setting conn_info %x to readiness state %d\n", component->conn_info, readinessState);
log_printf (LOG_LEVEL_DEBUG, "Setting conn_info %p to readiness state %d\n", component->conn_info, readinessState);
libais_send_response (component->conn_info, &res_lib_amf_readinessstatesetcallback,
sizeof (struct res_lib_amf_readinessstatesetcallback));
@ -900,7 +900,7 @@ static void dsmDisabledUnlockedRegisteredOrErrorCancel (
if (component->registered == 0 ||
component->probableCause) {
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not registered or failed.\n", getSaNameT (&component->name));
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not registered or failed.\n");
serviceUnitEnabled = 0;
break;
}
@ -986,7 +986,7 @@ static void dsmDisabledUnlockedQuiescedCompleted (
if (component->probableCause != SA_AMF_NOT_RESPONDING && component->registered) {
if (component->currentHAState != SA_AMF_QUIESCED) {
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not quiesced.\n", getSaNameT (&component->name));
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not quiesced.\n");
serviceUnitQuiesced = 0;
break;
}
@ -1045,7 +1045,7 @@ static void dsmDisabledUnlockedOutOfServiceCompleted (
if (component->probableCause != SA_AMF_NOT_RESPONDING && component->registered) {
if (component->currentReadinessState != SA_AMF_OUT_OF_SERVICE) {
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not quiesced.\n", getSaNameT (&component->name));
log_printf (LOG_LEVEL_DEBUG, "dsm: Can't transition states, found component not quiesced.\n");
serviceUnitOutOfService = 0;
break;
}
@ -1179,7 +1179,7 @@ static void dsmEnabledUnlockedInServiceCompleted (
component = list_entry (list,
struct saAmfComponent, saAmfComponentList);
log_printf (LOG_LEVEL_DEBUG, "Requesting component go active.\n", getSaNameT (&component->name));
log_printf (LOG_LEVEL_DEBUG, "Requesting component go active.\n");
/*
* Count number of active service units
@ -1873,7 +1873,8 @@ static int message_handler_req_exec_amf_componentregister (void *message, struct
req_exec_amf_componentregister->source.conn_info->component = component;
}
log_printf (LOG_LEVEL_DEBUG, "sending component register response to fd %d\n", req_exec_amf_componentregister->source.conn_info);
log_printf (LOG_LEVEL_DEBUG, "sending component register response to fd %d\n",
req_exec_amf_componentregister->source.conn_info->fd);
res_lib_amf_componentregister.header.size = sizeof (struct res_lib_amf_componentregister);
res_lib_amf_componentregister.header.id = MESSAGE_RES_AMF_COMPONENTREGISTER;
@ -1950,7 +1951,7 @@ static int message_handler_req_exec_amf_componentunregister (void *message, stru
*/
if (req_exec_amf_componentunregister->source.in_addr.s_addr == this_ip.sin_addr.s_addr) {
log_printf (LOG_LEVEL_DEBUG, "sending component unregister response to fd %d\n",
req_exec_amf_componentunregister->source.conn_info);
req_exec_amf_componentunregister->source.conn_info->fd);
res_lib_amf_componentunregister.header.size = sizeof (struct res_lib_amf_componentunregister);
res_lib_amf_componentunregister.header.id = MESSAGE_RES_AMF_COMPONENTUNREGISTER;
@ -1991,7 +1992,7 @@ static int message_handler_req_exec_amf_errorreport (void *message, struct in_ad
*/
if (req_exec_amf_errorreport->source.in_addr.s_addr == this_ip.sin_addr.s_addr) {
log_printf (LOG_LEVEL_DEBUG, "sending error report response to fd %d\n",
req_exec_amf_errorreport->source.conn_info);
req_exec_amf_errorreport->source.conn_info->fd);
res_lib_amf_errorreport.header.size = sizeof (struct res_lib_amf_errorreport);
res_lib_amf_errorreport.header.id = MESSAGE_RES_AMF_ERRORREPORT;
@ -2034,7 +2035,7 @@ static int message_handler_req_exec_amf_errorcancelall (void *message, struct in
*/
if (req_exec_amf_errorcancelall->source.in_addr.s_addr == this_ip.sin_addr.s_addr) {
log_printf (LOG_LEVEL_DEBUG, "sending error report response to fd %d\n",
req_exec_amf_errorcancelall->source.conn_info);
req_exec_amf_errorcancelall->source.conn_info->fd);
res_lib_amf_errorcancelall.header.size = sizeof (struct res_lib_amf_errorcancelall);
res_lib_amf_errorcancelall.header.id = MESSAGE_RES_AMF_ERRORCANCELALL;
@ -2429,7 +2430,7 @@ static int message_handler_req_amf_response (struct conn_info *conn_info_nouse,
res = req_amf_invocation_get_and_destroy (req_amf_response->invocation,
&interface, &conn_info);
log_printf (LOG_LEVEL_DEBUG, "handling response connection %x interface %x\n", conn_info, interface);
log_printf (LOG_LEVEL_DEBUG, "handling response connection %p interface %x\n", conn_info, interface);
switch (interface) {
case MESSAGE_REQ_AMF_RESPONSE_SAAMFHEALTHCHECKCALLBACK:
response_handler_healthcheckcallback (conn_info, req_amf_response);

26
exec/ckpt.c
View File

@ -368,9 +368,9 @@ static struct saCkptCheckpointSection *findCheckpointSection (
ckptCheckpointSection = list_entry (checkpointSectionList,
struct saCkptCheckpointSection, list);
log_printf (LOG_LEVEL_DEBUG, "Checking section id %s %d\n",
ckptCheckpointSection->sectionDescriptor.sectionId.id,
ckptCheckpointSection->sectionDescriptor.sectionId.idLen);
log_printf (LOG_LEVEL_DEBUG, "Checking section id %*s\n",
(int)ckptCheckpointSection->sectionDescriptor.sectionId.idLen,
ckptCheckpointSection->sectionDescriptor.sectionId.id);
if (ckptCheckpointSection->sectionDescriptor.sectionId.idLen == idLen &&
(memcmp (ckptCheckpointSection->sectionDescriptor.sectionId.id,
@ -461,7 +461,7 @@ static int ckpt_checkpoint_exit_fn (struct conn_info *conn_info)
*/
if (conn_info->service == SOCKET_SERVICE_CKPT_CHECKPOINT &&
conn_info->ais_ci.u.libckpt_ci.checkpoint) {
log_printf (LOG_LEVEL_DEBUG, "Trying to finalize %d %s\n", conn_info,
log_printf (LOG_LEVEL_DEBUG, "Trying to finalize %p %s\n", conn_info,
getSaNameT (&conn_info->ais_ci.u.libckpt_ci.checkpoint->name));
sendCkptCheckpointClose (conn_info->ais_ci.u.libckpt_ci.checkpoint);
@ -1391,7 +1391,7 @@ static int message_handler_req_lib_ckpt_checkpointretentiondurationset (struct c
struct req_exec_ckpt_checkpointretentiondurationset req_exec_ckpt_checkpointretentiondurationset;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "DURATION SET FROM API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "DURATION SET FROM API fd %d\n", conn_info->fd);
req_exec_ckpt_checkpointretentiondurationset.header.id = MESSAGE_REQ_EXEC_CKPT_CHECKPOINTRETENTIONDURATIONSET;
req_exec_ckpt_checkpointretentiondurationset.header.size = sizeof (struct req_exec_ckpt_checkpointretentiondurationset);
@ -1470,7 +1470,7 @@ static int message_handler_req_lib_ckpt_sectioncreate (struct conn_info *conn_in
struct res_lib_ckpt_sectioncreate res_lib_ckpt_sectioncreate;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "Section create from API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "Section create from API fd %d\n", conn_info->fd);
/*
* Determine if checkpoint is opened in write mode If not, send error to api
*/
@ -1523,7 +1523,7 @@ for (i = 0; i < 14;i++) {
printf ("|\n");
#endif
if (iovecs[1].iov_len > 0) {
log_printf (LOG_LEVEL_DEBUG, "IOV_BASE is %s\n", iovecs[1].iov_base);
log_printf (LOG_LEVEL_DEBUG, "IOV_BASE is %p\n", iovecs[1].iov_base);
assert (gmi_mcast (&aisexec_groupname, iovecs, 2, GMI_PRIO_MED) == 0);
} else {
assert (gmi_mcast (&aisexec_groupname, iovecs, 1, GMI_PRIO_MED) == 0);
@ -1538,7 +1538,7 @@ static int message_handler_req_lib_ckpt_sectiondelete (struct conn_info *conn_in
struct req_exec_ckpt_sectiondelete req_exec_ckpt_sectiondelete;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "section delete from API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "section delete from API fd %d\n", conn_info->fd);
req_exec_ckpt_sectiondelete.header.id = MESSAGE_REQ_EXEC_CKPT_SECTIONDELETE;
req_exec_ckpt_sectiondelete.header.size = sizeof (struct req_exec_ckpt_sectiondelete);
@ -1578,7 +1578,7 @@ static int message_handler_req_lib_ckpt_sectionexpirationtimeset (struct conn_in
struct req_exec_ckpt_sectionexpirationtimeset req_exec_ckpt_sectionexpirationtimeset;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "section expiration time set fd=%d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "section expiration time set fd=%d\n", conn_info->fd);
req_exec_ckpt_sectionexpirationtimeset.header.id = MESSAGE_REQ_EXEC_CKPT_SECTIONEXPIRATIONTIMESET;
req_exec_ckpt_sectionexpirationtimeset.header.size = sizeof (struct req_exec_ckpt_sectionexpirationtimeset);
@ -1603,7 +1603,7 @@ static int message_handler_req_lib_ckpt_sectionexpirationtimeset (struct conn_in
iovecs[1].iov_len = req_lib_ckpt_sectionexpirationtimeset->header.size - sizeof (struct req_lib_ckpt_sectionexpirationtimeset);
if (iovecs[1].iov_len > 0) {
log_printf (LOG_LEVEL_DEBUG, "IOV_BASE is %s\n", iovecs[1].iov_base);
log_printf (LOG_LEVEL_DEBUG, "IOV_BASE is %p\n", iovecs[1].iov_base);
assert (gmi_mcast (&aisexec_groupname, iovecs, 2, GMI_PRIO_LOW) == 0);
} else {
assert (gmi_mcast (&aisexec_groupname, iovecs, 1, GMI_PRIO_LOW) == 0);
@ -1620,7 +1620,7 @@ static int message_handler_req_lib_ckpt_sectionwrite (struct conn_info *conn_inf
struct res_lib_ckpt_sectionwrite res_lib_ckpt_sectionwrite;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "Section write from API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "Section write from API fd %d\n", conn_info->fd);
// UNDO printf ("section write %d\n", write_inv++);
/*
* Determine if checkpoint is opened in write mode If not, send error to api
@ -1677,7 +1677,7 @@ static int message_handler_req_lib_ckpt_sectionoverwrite (struct conn_info *conn
struct res_lib_ckpt_sectionoverwrite res_lib_ckpt_sectionoverwrite;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "Section overwrite from API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "Section overwrite from API fd %d\n", conn_info->fd);
/*
* Determine if checkpoint is opened in write mode If not, send error to api
*/
@ -1732,7 +1732,7 @@ static int message_handler_req_lib_ckpt_sectionread (struct conn_info *conn_info
struct res_lib_ckpt_sectionread res_lib_ckpt_sectionread;
struct iovec iovecs[2];
log_printf (LOG_LEVEL_DEBUG, "Section overwrite from API fd %d\n", conn_info);
log_printf (LOG_LEVEL_DEBUG, "Section overwrite from API fd %d\n", conn_info->fd);
/*
* Determine if checkpoint is opened in write mode If not, send error to api
*/