daemons/based/based_callbacks.c

@@ -594,8 +594,8 @@ parse_peer_options_v1(int call_type, xmlNode * request,
         return TRUE;
     }
 
-    crm_trace("Processing %s request sent by %s", op, originator);
     op = crm_element_value(request, F_CIB_OPERATION);
+    crm_trace("Processing %s request sent by %s", op, originator);
     if (safe_str_eq(op, "cib_shutdown_req")) {
         /* Always process these */
         *local_notify = FALSE;
@@ -650,11 +650,11 @@ parse_peer_options_v1(int call_type, xmlNode * request,
 
     } else if (safe_str_eq(op, "cib_shutdown_req")) {
         if (reply_to != NULL) {
-            crm_debug("Processing %s from %s", op, host);
+            crm_debug("Processing %s from %s", op, originator);
             *needs_reply = FALSE;
 
         } else {
-            crm_debug("Processing %s reply from %s", op, host);
+            crm_debug("Processing %s reply from %s", op, originator);
         }
         return TRUE;
 

tools/test.iso8601.c

@@ -8,6 +8,7 @@
 #include <crm_internal.h>
 #include <crm/crm.h>
 #include <crm/common/iso8601.h>
+#include <crm/common/util.h>  /* CRM_ASSERT */
 #include <unistd.h>
 
 char command = 0;
@@ -46,13 +47,9 @@ static struct crm_option long_options[] = {
 static void
 log_time_period(int log_level, crm_time_period_t * dtp, int flags)
 {
-    char *end = NULL;
-    char *start = NULL;
-
-    if(dtp) {
-        start = crm_time_as_string(dtp->start, flags);
-        end = crm_time_as_string(dtp->end, flags);
-    }
+    char *start = crm_time_as_string(dtp->start, flags);
+    char *end = crm_time_as_string(dtp->end, flags);
+    CRM_ASSERT(start != NULL && end != NULL);
 
     if (log_level < LOG_CRIT) {
         printf("Period: %s to %s\n", start, end);