File pacemaker-attrd-cib-libcrmcommon-avoid-%z.patch of Package pacemaker.10804

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-attrd-cib-libcrmcommon-avoid-%z.patch of Package pacemaker.10804

commit 55b023527ad8d320c46150d34f632a7286bc6823
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Fri Apr 6 10:02:05 2018 -0500

Low: attrd,cib,libcrmcommon: avoid %z
    
    Older versions of corosync don't support it when serializing/unserializing
    black boxes

diff --git a/attrd/commands.c b/attrd/commands.c
index 51b253162..1890cd19c 100644
--- a/attrd/commands.c
+++ b/attrd/commands.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2013 Andrew Beekhof <andrew@beekhof.net>
+ * Copyright 2013-2018 Andrew Beekhof <andrew@beekhof.net>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * This source code is licensed under the GNU General Public License version 2
+ * or later (GPLv2+) WITHOUT ANY WARRANTY.
  */
+
 #include <crm_internal.h>
 
 #include <sys/types.h>
@@ -491,8 +481,8 @@ attrd_client_query(crm_client_t *client, uint32_t id, uint32_t flags, xmlNode *q
     /* Send the reply to the client */
     client->request_id = 0;
     if ((rc = crm_ipcs_send(client, id, reply, flags)) < 0) {
-        crm_err("Could not respond to query from %s: %s (%zd)",
-                origin, pcmk_strerror(-rc), -rc);
+        crm_err("Could not respond to query from %s: %s (%lld)",
+                origin, pcmk_strerror(-rc), (long long) -rc);
     }
     free_xml(reply);
 }
diff --git a/cib/notify.c b/cib/notify.c
index 55201885f..c62ae2724 100644
--- a/cib/notify.c
+++ b/cib/notify.c
@@ -1,19 +1,8 @@
 /*
- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * This source code is licensed under the GNU General Public License version 2
+ * or later (GPLv2+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
@@ -127,7 +116,8 @@ cib_notify_send(xmlNode * xml)
         g_hash_table_foreach_remove(client_connections, cib_notify_send_one, &update);
 
     } else {
-        crm_notice("Notification failed: %s (%zd)", pcmk_strerror(rc), rc);
+        crm_notice("Could not notify clients: %s " CRM_XS " rc=%lld",
+                   pcmk_strerror(rc), (long long) rc);
     }
 
     if (iov) {
diff --git a/lib/common/ipc.c b/lib/common/ipc.c
index 615a65a13..e911fcf82 100644
--- a/lib/common/ipc.c
+++ b/lib/common/ipc.c
@@ -734,8 +734,10 @@ crm_ipcs_sendv(crm_client_t * c, struct iovec * iov, enum crm_ipc_flags flags)
 
         rc = qb_ipcs_response_sendv(c->ipcs, iov, 2);
         if (rc < header->qb.size) {
-            crm_notice("Response %d to %p[%d] (%u bytes) failed: %s (%zd)",
-                       header->qb.id, c->ipcs, c->pid, header->qb.size, pcmk_strerror(rc), rc);
+            crm_notice("Response %d to pid %d failed: %s "
+                       CRM_XS " bytes=%u rc=%lld ipcs=%p",
+                       header->qb.id, c->pid, pcmk_strerror(rc),
+                       header->qb.size, (long long) rc, c->ipcs);
 
         } else {
             crm_trace("Response %d sent, %lld bytes to %p[%d]",
@@ -780,8 +782,8 @@ crm_ipcs_send(crm_client_t * c, uint32_t request, xmlNode * message,
 
     } else {
         free(iov);
-        crm_notice("Message to %p[%d] failed: %s (%zd)",
-                   c->ipcs, c->pid, pcmk_strerror(rc), rc);
+        crm_notice("Message to pid %d failed: %s " CRM_XS " rc=%lld ipcs=%p",
+                   c->pid, pcmk_strerror(rc), (long long) rc, c->ipcs);
     }
 
     return rc;

Places

File pacemaker-attrd-cib-libcrmcommon-avoid-%z.patch of Package pacemaker.10804

Places