File pacemaker-libcrmcommon-tools-use-format-strings... of Package pacemaker.13253

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-libcrmcommon-tools-use-format-strings-appropriate-to-variables.patch of Package pacemaker.13253

commit 3ffb66924bc903bf1b516dc3c44f65c6613ec3f3
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Wed Apr 4 16:24:20 2018 -0500

Low: libcrmcommon,tools: use format strings appropriate to variables

diff --git a/lib/common/utils.c b/lib/common/utils.c
index 5bbcb58c7..14053f952 100644
--- a/lib/common/utils.c
+++ b/lib/common/utils.c
@@ -1,19 +1,8 @@
 /*
- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser 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 Lesser General Public License
+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
@@ -723,7 +712,7 @@ crm_pid_active(long pid, const char *daemon)
         char proc_path[PATH_MAX], exe_path[PATH_MAX], myexe_path[PATH_MAX];
 
         /* check to make sure pid hasn't been reused by another process */
-        snprintf(proc_path, sizeof(proc_path), "/proc/%lu/exe", pid);
+        snprintf(proc_path, sizeof(proc_path), "/proc/%ld/exe", pid);
 
         rc = readlink(proc_path, exe_path, PATH_MAX - 1);
         if (rc < 0 && errno == EACCES) {
@@ -777,7 +766,7 @@ crm_read_pidfile(const char *filename)
         goto bail;
     }
 
-    if (sscanf(buf, "%lu", &pid) > 0) {
+    if (sscanf(buf, "%ld", &pid) > 0) {
         if (pid <= 0) {
             pid = -ESRCH;
         } else {
@@ -842,7 +831,7 @@ crm_lock_pidfile(const char *filename, const char *name)
         return -errno;
     }
 
-    snprintf(buf, sizeof(buf), "%*lu\n", LOCKSTRLEN - 1, mypid);
+    snprintf(buf, sizeof(buf), "%*ld\n", LOCKSTRLEN - 1, mypid);
     rc = write(fd, buf, LOCKSTRLEN);
     close(fd);
 
diff --git a/tools/crm_node.c b/tools/crm_node.c
index 01781c01c..62b67336d 100644
--- a/tools/crm_node.c
+++ b/tools/crm_node.c
@@ -1,19 +1,8 @@
-/* 
- * Copyright (C) 2004 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
+/*
+ * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>
+ *
+ * This source code is licensed under the GNU General Public License version 2
+ * or later (GPLv2+) WITHOUT ANY WARRANTY.
  */
 
 #include <crm_internal.h>
@@ -175,7 +164,7 @@ int tools_remove_node_cache(const char *node, const char *target)
 
         if (n) {
             char buffer[64];
-            if(snprintf(buffer, 63, "%u", n) > 0) {
+            if(snprintf(buffer, 63, "%d", n) > 0) {
                 crm_xml_add(cmd, F_ATTRD_HOST_ID, buffer);
             }
         }

Places

File pacemaker-libcrmcommon-tools-use-format-strings-appropriate-to-variables.patch of Package pacemaker.13253

Places