From: Hannes Reinecke <hare@suse.de>
To: Christophe Varoqui <christophe.varoqui@gmail.com>
Cc: dm-devel@redhat.com
Subject: [PATCH 19/42] Inconsistent string quoting
Date: Tue, 8 Jan 2013 14:53:57 +0100 [thread overview]
Message-ID: <1357653259-62650-20-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1357653259-62650-1-git-send-email-hare@suse.de>
When printing the hardware table strings are quoted twice, and
even numerical values have single quotes. This patch removes
the double quotes and retains single quotes only for string
values.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
libmultipath/dict.c | 98 +++++++++++++++++++++++++-------------------------
1 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/libmultipath/dict.c b/libmultipath/dict.c
index ab9fdeb..6dae335 100644
--- a/libmultipath/dict.c
+++ b/libmultipath/dict.c
@@ -1062,11 +1062,11 @@ hw_failback_handler(vector strvec)
buff = set_value(strvec);
- if (strlen(buff) == 6 && !strcmp(buff, "manual"))
+ if (strlen(buff) == 6 && !strcmp(buff, "\"manual\""))
hwe->pgfailback = -FAILBACK_MANUAL;
- else if (strlen(buff) == 9 && !strcmp(buff, "immediate"))
+ else if (strlen(buff) == 9 && !strcmp(buff, "\"immediate\""))
hwe->pgfailback = -FAILBACK_IMMEDIATE;
- else if (strlen(buff) == 10 && !strcmp(buff, "followover"))
+ else if (strlen(buff) == 10 && !strcmp(buff, "\"followover\""))
hwe->pgfailback = -FAILBACK_FOLLOWOVER;
else
hwe->pgfailback = atoi(buff);
@@ -1757,7 +1757,7 @@ snprint_mp_path_grouping_policy (char * buff, int len, void * data)
return 0;
get_pgpolicy_name(str, POLICY_NAME_SIZE, mpe->pgpolicy);
- return snprintf(buff, len, "%s", str);
+ return snprintf(buff, len, "\"%s\"", str);
}
static int
@@ -1832,9 +1832,9 @@ snprint_mp_rr_weight (char * buff, int len, void * data)
if (!mpe->rr_weight)
return 0;
if (mpe->rr_weight == RR_WEIGHT_PRIO)
- return snprintf(buff, len, "priorities");
+ return snprintf(buff, len, "\"priorities\"");
if (mpe->rr_weight == RR_WEIGHT_NONE)
- return snprintf(buff, len, "uniform");
+ return snprintf(buff, len, "\"uniform\"");
return 0;
}
@@ -1851,9 +1851,9 @@ snprint_mp_no_path_retry (char * buff, int len, void * data)
case NO_PATH_RETRY_UNDEF:
break;
case NO_PATH_RETRY_FAIL:
- return snprintf(buff, len, "fail");
+ return snprintf(buff, len, "\"fail\"");
case NO_PATH_RETRY_QUEUE:
- return snprintf(buff, len, "queue");
+ return snprintf(buff, len, "\"queue\"");
default:
return snprintf(buff, len, "%i",
mpe->no_path_retry);
@@ -1892,7 +1892,7 @@ snprint_mp_pg_timeout (char * buff, int len, void * data)
case PGTIMEOUT_UNDEF:
break;
case -PGTIMEOUT_NONE:
- return snprintf(buff, len, "none");
+ return snprintf(buff, len, "\"none\"");
default:
return snprintf(buff, len, "%i", mpe->pg_timeout);
}
@@ -1910,7 +1910,7 @@ snprint_mp_features (char * buff, int len, void * data)
!strcmp(mpe->features, conf->features))
return 0;
- return snprintf(buff, len, "%s", mpe->features);
+ return snprintf(buff, len, "\"%s\"", mpe->features);
}
static int
@@ -1920,9 +1920,9 @@ snprint_mp_flush_on_last_del (char * buff, int len, void * data)
switch (mpe->flush_on_last_del) {
case FLUSH_DISABLED:
- return snprintf(buff, len, "no");
+ return snprintf(buff, len, "\"no\"");
case FLUSH_ENABLED:
- return snprintf(buff, len, "yes");
+ return snprintf(buff, len, "\"yes\"");
}
return 0;
}
@@ -1935,7 +1935,7 @@ snprint_mp_prio(char * buff, int len, void * data)
if (!mpe->prio_name)
return 0;
- return snprintf(buff, len, "%s", mpe->prio_name);
+ return snprintf(buff, len, "\"%s\"", mpe->prio_name);
}
static int
@@ -1946,7 +1946,7 @@ snprint_mp_prio_args(char * buff, int len, void * data)
if (!mpe->prio_args)
return 0;
- return snprintf(buff, len, "%s", mpe->prio_args);
+ return snprintf(buff, len, "\"%s\"", mpe->prio_args);
}
static int
@@ -1978,7 +1978,7 @@ snprint_hw_fast_io_fail(char * buff, int len, void * data)
if (hwe->fast_io_fail == conf->fast_io_fail)
return 0;
if (hwe->fast_io_fail == MP_FAST_IO_FAIL_OFF)
- return snprintf(buff, len, "off");
+ return snprintf(buff, len, "\"off\"");
if (hwe->fast_io_fail == MP_FAST_IO_FAIL_ZERO)
return snprintf(buff, len, "0");
return snprintf(buff, len, "%d", hwe->fast_io_fail);
@@ -1993,7 +1993,7 @@ snprint_hw_dev_loss(char * buff, int len, void * data)
if (hwe->dev_loss == conf->dev_loss)
return 0;
if (hwe->dev_loss >= MAX_DEV_LOSS_TMO)
- return snprintf(buff, len, "infinity");
+ return snprintf(buff, len, "\"infinity\"");
return snprintf(buff, len, "%u", hwe->dev_loss);
}
@@ -2061,7 +2061,7 @@ snprint_hw_prio (char * buff, int len, void * data)
if (!hwe->prio_name)
return 0;
- return snprintf(buff, len, "%s", hwe->prio_name);
+ return snprintf(buff, len, "\"%s\"", hwe->prio_name);
}
static int
@@ -2131,7 +2131,7 @@ snprint_hw_path_grouping_policy (char * buff, int len, void * data)
get_pgpolicy_name(str, POLICY_NAME_SIZE, hwe->pgpolicy);
- return snprintf(buff, len, "%s", str);
+ return snprintf(buff, len, "\"%s\"", str);
}
static int
@@ -2165,9 +2165,9 @@ snprint_hw_rr_weight (char * buff, int len, void * data)
if (!hwe->rr_weight)
return 0;
if (hwe->rr_weight == RR_WEIGHT_PRIO)
- return snprintf(buff, len, "priorities");
+ return snprintf(buff, len, "\"priorities\"");
if (hwe->rr_weight == RR_WEIGHT_NONE)
- return snprintf(buff, len, "uniform");
+ return snprintf(buff, len, "\"uniform\"");
return 0;
}
@@ -2184,9 +2184,9 @@ snprint_hw_no_path_retry (char * buff, int len, void * data)
case NO_PATH_RETRY_UNDEF:
break;
case NO_PATH_RETRY_FAIL:
- return snprintf(buff, len, "fail");
+ return snprintf(buff, len, "\"fail\"");
case NO_PATH_RETRY_QUEUE:
- return snprintf(buff, len, "queue");
+ return snprintf(buff, len, "\"queue\"");
default:
return snprintf(buff, len, "%i",
hwe->no_path_retry);
@@ -2228,7 +2228,7 @@ snprint_hw_pg_timeout (char * buff, int len, void * data)
case PGTIMEOUT_UNDEF:
break;
case -PGTIMEOUT_NONE:
- return snprintf(buff, len, "none");
+ return snprintf(buff, len, "\"none\"");
default:
return snprintf(buff, len, "%i", hwe->pg_timeout);
}
@@ -2242,9 +2242,9 @@ snprint_hw_flush_on_last_del (char * buff, int len, void * data)
switch (hwe->flush_on_last_del) {
case FLUSH_DISABLED:
- return snprintf(buff, len, "no");
+ return snprintf(buff, len, "\"no\"");
case FLUSH_ENABLED:
- return snprintf(buff, len, "yes");
+ return snprintf(buff, len, "\"yes\"");
}
return 0;
}
@@ -2257,7 +2257,7 @@ snprint_hw_path_checker (char * buff, int len, void * data)
if (!hwe->checker_name)
return 0;
- return snprintf(buff, len, "%s", hwe->checker_name);
+ return snprintf(buff, len, "\"%s\"", hwe->checker_name);
}
static int
@@ -2285,7 +2285,7 @@ snprint_def_fast_io_fail(char * buff, int len, void * data)
if (conf->fast_io_fail == MP_FAST_IO_FAIL_UNSET)
return 0;
if (conf->fast_io_fail == MP_FAST_IO_FAIL_OFF)
- return snprintf(buff, len, "off");
+ return snprintf(buff, len, "\"off\"");
if (conf->fast_io_fail == MP_FAST_IO_FAIL_ZERO)
return snprintf(buff, len, "0");
return snprintf(buff, len, "%d", conf->fast_io_fail);
@@ -2297,7 +2297,7 @@ snprint_def_dev_loss(char * buff, int len, void * data)
if (!conf->dev_loss)
return 0;
if (conf->dev_loss >= MAX_DEV_LOSS_TMO)
- return snprintf(buff, len, "infinity");
+ return snprintf(buff, len, "\"infinity\"");
return snprintf(buff, len, "%u", conf->dev_loss);
}
@@ -2320,7 +2320,7 @@ snprint_reassign_maps (char * buff, int len, void * data)
{
if (conf->reassign_maps == DEFAULT_REASSIGN_MAPS)
return 0;
- return snprintf(buff, len, "%s",
+ return snprintf(buff, len, "\"%s\"",
conf->reassign_maps?"yes":"no");
}
@@ -2353,7 +2353,7 @@ snprint_def_path_grouping_policy (char * buff, int len, void * data)
get_pgpolicy_name(str, POLICY_NAME_SIZE, pgpolicy);
- return snprintf(buff, len, "%s", str);
+ return snprintf(buff, len, "\"%s\"", str);
}
static int
@@ -2369,9 +2369,9 @@ static int
snprint_def_prio (char * buff, int len, void * data)
{
if (!conf->prio_name)
- return snprintf(buff, len, "%s", DEFAULT_PRIO);
+ return snprintf(buff, len, "\"%s\"", DEFAULT_PRIO);
- return snprintf(buff, len, "%s", conf->prio_name);
+ return snprintf(buff, len, "\"%s\"", conf->prio_name);
}
static int
@@ -2396,9 +2396,9 @@ static int
snprint_def_path_checker (char * buff, int len, void * data)
{
if (!conf->checker_name)
- return snprintf(buff, len, "%s", DEFAULT_CHECKER);
+ return snprintf(buff, len, "\"%s\"", DEFAULT_CHECKER);
- return snprintf(buff, len, "%s", conf->checker_name);
+ return snprintf(buff, len, "\"%s\"", conf->checker_name);
}
static int
@@ -2412,11 +2412,11 @@ snprint_def_failback (char * buff, int len, void * data)
case FAILBACK_UNDEF:
break;
case -FAILBACK_MANUAL:
- return snprintf(buff, len, "manual");
+ return snprintf(buff, len, "\"manual\"");
case -FAILBACK_IMMEDIATE:
- return snprintf(buff, len, "immediate");
+ return snprintf(buff, len, "\"immediate\"");
case -FAILBACK_FOLLOWOVER:
- return snprintf(buff, len, "followover");
+ return snprintf(buff, len, "\"followover\"");
default:
return snprintf(buff, len, "%i", conf->pgfailback);
}
@@ -2478,9 +2478,9 @@ static int
snprint_def_rr_weight (char * buff, int len, void * data)
{
if (!conf->rr_weight || conf->rr_weight == RR_WEIGHT_NONE)
- return snprintf(buff, len, "uniform");
+ return snprintf(buff, len, "\"uniform\"");
if (conf->rr_weight == RR_WEIGHT_PRIO)
- return snprintf(buff, len, "priorities");
+ return snprintf(buff, len, "\"priorities\"");
return 0;
}
@@ -2492,9 +2492,9 @@ snprint_def_no_path_retry (char * buff, int len, void * data)
case NO_PATH_RETRY_UNDEF:
break;
case NO_PATH_RETRY_FAIL:
- return snprintf(buff, len, "fail");
+ return snprintf(buff, len, "\"fail\"");
case NO_PATH_RETRY_QUEUE:
- return snprintf(buff, len, "queue");
+ return snprintf(buff, len, "\"queue\"");
default:
return snprintf(buff, len, "%i",
conf->no_path_retry);
@@ -2507,10 +2507,10 @@ snprint_def_queue_without_daemon (char * buff, int len, void * data)
{
switch (conf->queue_without_daemon) {
case QUE_NO_DAEMON_OFF:
- return snprintf(buff, len, "no");
+ return snprintf(buff, len, "\"no\"");
case QUE_NO_DAEMON_ON:
case QUE_NO_DAEMON_UNDEF:
- return snprintf(buff, len, "yes");
+ return snprintf(buff, len, "\"yes\"");
}
return 0;
}
@@ -2530,7 +2530,7 @@ snprint_def_pg_timeout (char * buff, int len, void * data)
switch (conf->pg_timeout) {
case PGTIMEOUT_UNDEF:
case -PGTIMEOUT_NONE:
- return snprintf(buff, len, "none");
+ return snprintf(buff, len, "\"none\"");
default:
return snprintf(buff, len, "%i", conf->pg_timeout);
}
@@ -2543,10 +2543,10 @@ snprint_def_flush_on_last_del (char * buff, int len, void * data)
switch (conf->flush_on_last_del) {
case FLUSH_UNDEF:
case FLUSH_DISABLED:
- return snprintf(buff, len, "no");
+ return snprintf(buff, len, "\"no\"");
case FLUSH_ENABLED:
case FLUSH_IN_PROGRESS:
- return snprintf(buff, len, "yes");
+ return snprintf(buff, len, "\"yes\"");
}
return 0;
}
@@ -2563,9 +2563,9 @@ static int
snprint_def_user_friendly_names (char * buff, int len, void * data)
{
if (conf->user_friendly_names == USER_FRIENDLY_NAMES_ON)
- return snprintf(buff, len, "yes");
+ return snprintf(buff, len, "\"yes\"");
else
- return snprintf(buff, len, "no");
+ return snprintf(buff, len, "\"no\"");
}
static int
@@ -2581,7 +2581,7 @@ snprint_def_bindings_file (char * buff, int len, void * data)
{
if (conf->bindings_file == NULL)
return 0;
- return snprintf(buff, len, "%s", conf->bindings_file);
+ return snprintf(buff, len, "\"%s\"", conf->bindings_file);
}
static int
--
1.7.4.2
next prev parent reply other threads:[~2013-01-08 13:53 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-08 13:53 [PATCH 00/42] SLES resync Hannes Reinecke
2013-01-08 13:53 ` [PATCH 01/42] libmultipath: Invalid check for mpp->wwid in dm_addmap() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 02/42] Remove newline from condlog() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 03/42] Fixup pathgroup allocation in disassemble_map() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 04/42] libmultipath: resource leak in read_value_block() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 05/42] prio: fix merging of prioritizers with different args Hannes Reinecke
2013-01-08 13:53 ` [PATCH 06/42] Accept several whitespaces in bindings file Hannes Reinecke
2013-01-08 13:53 ` [PATCH 07/42] Add TAGS makefile target Hannes Reinecke
2013-01-08 13:53 ` [PATCH 08/42] libmultipath: Fix typo in mp_prio_handler() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 09/42] Do not trigger a map reload on priority updates Hannes Reinecke
2013-01-08 13:53 ` [PATCH 10/42] Introduce MP_FAST_IO_FAIL_UNSET Hannes Reinecke
2013-01-08 13:53 ` [PATCH 11/42] Checker name is not displayed on failure Hannes Reinecke
2013-01-08 13:53 ` [PATCH 12/42] Valgrind fixes for prioritizer Hannes Reinecke
2013-01-08 13:53 ` [PATCH 13/42] Incorrect inquiry vendor length in hds prioritizer Hannes Reinecke
2013-01-08 13:53 ` [PATCH 14/42] Print out multipath alias for flush_on_last_del messages Hannes Reinecke
2013-01-08 13:53 ` [PATCH 15/42] Clarify setting origin in propsel.c Hannes Reinecke
2013-01-08 13:53 ` [PATCH 16/42] libmultipath: error checking in remove_features() Hannes Reinecke
2013-01-08 13:53 ` [PATCH 17/42] Increase parameter buffer Hannes Reinecke
2013-01-08 13:53 ` [PATCH 18/42] Check return code from pathinfo() Hannes Reinecke
2013-01-08 13:53 ` Hannes Reinecke [this message]
2013-01-08 13:53 ` [PATCH 20/42] Switch off 'queue_if_no_path' before removing maps Hannes Reinecke
2013-01-08 13:53 ` [PATCH 21/42] Double free in disassemble_map() Hannes Reinecke
2013-01-08 13:54 ` [PATCH 22/42] libmultipath: prio keyword ignored for multipath config Hannes Reinecke
2013-01-08 13:54 ` [PATCH 23/42] Path checker should return PATH_DOWN when no path is found Hannes Reinecke
2013-01-08 13:54 ` [PATCH 24/42] Do not call sysfs_get_timeout for non-SCSI devices Hannes Reinecke
2013-01-08 13:54 ` [PATCH 25/42] Make log_pthread more robust Hannes Reinecke
2013-01-09 0:16 ` Christophe Varoqui
2013-01-09 19:15 ` Xose Vazquez Perez
2013-01-08 13:54 ` [PATCH 26/42] Print log messages when updating tables failed Hannes Reinecke
2013-01-08 13:54 ` [PATCH 27/42] Update 'no_path_retry' correctly for failed paths Hannes Reinecke
2013-01-08 13:54 ` [PATCH 28/42] Clean up uevent queue on shutdown Hannes Reinecke
2013-01-08 13:54 ` [PATCH 29/42] libmultipath: Print out uevent sequence number Hannes Reinecke
2013-01-08 13:54 ` [PATCH 30/42] Fix race condition in stop_waiter_thread() Hannes Reinecke
2013-01-08 13:54 ` [PATCH 31/42] Use VECTOR_SIZE() defines Hannes Reinecke
2013-01-08 13:54 ` [PATCH 32/42] Make 'allocated' an integer in vector.h Hannes Reinecke
2013-01-08 13:54 ` [PATCH 33/42] Syntax error in /etc/init.d/boot.multipath Hannes Reinecke
2013-01-08 13:54 ` [PATCH 34/42] multipath.init.suse: Update usage message Hannes Reinecke
2013-01-08 13:54 ` [PATCH 35/42] multipath.conf.5: Clarify dev_loss_tmo settings Hannes Reinecke
2013-01-08 13:54 ` [PATCH 36/42] Clarify dev_loss_tmo capping in multipath.conf.5 Hannes Reinecke
2013-01-08 13:54 ` [PATCH 38/42] multipathd: Ignore errors when creating pidfile Hannes Reinecke
2013-01-08 13:54 ` [PATCH 39/42] multipathd deadlocks during restart Hannes Reinecke
2013-01-08 13:54 ` [PATCH 40/42] multipathd: sighandlers might use uninitialized gvecs Hannes Reinecke
2013-01-08 13:54 ` [PATCH 41/42] multipathd: crash in reconfigure CLI command Hannes Reinecke
2013-01-08 13:54 ` [PATCH 42/42] multipathd: lock vectors during initial configuration Hannes Reinecke
2013-01-08 23:37 ` Christophe Varoqui
2013-01-09 7:01 ` Hannes Reinecke
2013-01-08 23:53 ` [PATCH 00/42] SLES resync Christophe Varoqui
2013-01-10 5:36 ` Benjamin Marzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357653259-62650-20-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=christophe.varoqui@gmail.com \
--cc=dm-devel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.