Explorar el Código

More natural error messages

Signed-off-by: Ferenc Wágner <wferi@debian.org>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Reviewed-by: Jan Friesse <jfriesse@redhat.com>
Ferenc Wágner hace 7 años
padre
commit
ba24bef8bd
Se han modificado 3 ficheros con 3 adiciones y 3 borrados
  1. 1 1
      exec/coroparse.c
  2. 1 1
      exec/main.c
  3. 1 1
      exec/totemconfig.c

+ 1 - 1
exec/coroparse.c

@@ -1633,7 +1633,7 @@ static int read_config_file_into_icmap(
 		char error_str[100];
 		char error_str[100];
 		const char *error_ptr = qb_strerror_r(errno, error_str, sizeof(error_str));
 		const char *error_ptr = qb_strerror_r(errno, error_str, sizeof(error_str));
 		snprintf (error_reason, sizeof(error_string_response),
 		snprintf (error_reason, sizeof(error_string_response),
-			"Can't read file %s reason = (%s)",
+			"Can't read file %s: %s",
 			 filename, error_ptr);
 			 filename, error_ptr);
 		*error_string = error_reason;
 		*error_string = error_reason;
 		return -1;
 		return -1;

+ 1 - 1
exec/main.c

@@ -1334,7 +1334,7 @@ int main (int argc, char **argv, char **envp)
 	 */
 	 */
 	res = stat (get_state_dir(), &stat_out);
 	res = stat (get_state_dir(), &stat_out);
 	if ((res == -1) || (res == 0 && !S_ISDIR(stat_out.st_mode))) {
 	if ((res == -1) || (res == 0 && !S_ISDIR(stat_out.st_mode))) {
-		log_printf (LOGSYS_LEVEL_ERROR, "Required directory not present %s.  Please create it.", get_state_dir());
+		log_printf (LOGSYS_LEVEL_ERROR, "State directory %s not present.  Please create it.", get_state_dir());
 		corosync_exit_error (COROSYNC_DONE_DIR_NOT_PRESENT);
 		corosync_exit_error (COROSYNC_DONE_DIR_NOT_PRESENT);
 	}
 	}
 
 

+ 1 - 1
exec/totemconfig.c

@@ -1734,7 +1734,7 @@ extern int totem_config_read (
 				*warnings |= TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED;
 				*warnings |= TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED;
 			}
 			}
 			if ((totem_config->transport_number == TOTEM_TRANSPORT_KNET) && (!totem_config->node_id)) {
 			if ((totem_config->transport_number == TOTEM_TRANSPORT_KNET) && (!totem_config->node_id)) {
-				*error_string = "With knet, you must specify nodeid for current node";
+				*error_string = "Knet requires an explicit nodeid for the local node";
 				return -1;
 				return -1;
 			}
 			}