From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xensource.com
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Subject: [PATCH 02 of 18] tools/blktap: constify string arrays in convert_dev_name_to_num
Date: Mon, 02 Apr 2012 22:15:25 +0200 [thread overview]
Message-ID: <569fc8260490b64ae837.1333397725@probook.site> (raw)
In-Reply-To: <patchbomb.1333397723@probook.site>
# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1333397505 -7200
# Node ID 569fc8260490b64ae837c6ed67f1a5b2e582744c
# Parent 21640ef72ce861892d71f3916ba6ed0f9a411cca
tools/blktap: constify string arrays in convert_dev_name_to_num
Signed-off-by: Olaf Hering <olaf@aepfle.de>
diff -r 21640ef72ce8 -r 569fc8260490 tools/blktap/lib/xs_api.c
--- a/tools/blktap/lib/xs_api.c
+++ b/tools/blktap/lib/xs_api.c
@@ -210,14 +210,15 @@ done:
}
int convert_dev_name_to_num(char *name) {
- char *p, *ptr;
+ char *p;
+ const char *ptr;
int majors[10] = {3,22,33,34,56,57,88,89,90,91};
int maj,i,ret = 0;
- char *p_sd = "/dev/sd";
- char *p_hd = "/dev/hd";
- char *p_xvd = "/dev/xvd";
- char *p_plx = "plx";
- char *alpha = "abcdefghijklmnop";
+ const char p_sd[] = "/dev/sd";
+ const char p_hd[] = "/dev/hd";
+ const char p_xvd[] = "/dev/xvd";
+ const char p_plx[] = "plx";
+ const char alpha[] = "abcdefghijklmnop";
if (strstr(name, p_sd) != NULL) {
p = name + strlen(p_sd);
next prev parent reply other threads:[~2012-04-02 20:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-02 20:15 [PATCH 00 of 18] [v2] tools: fix bugs and build errors triggered by -O2 -Wall -Werror Olaf Hering
2012-04-02 20:15 ` [PATCH 01 of 18] tools/blktap: remove unneeded pointer dereferencing in convert_dev_name_to_num Olaf Hering
2012-04-02 20:15 ` Olaf Hering [this message]
2012-04-02 20:15 ` [PATCH 03 of 18] tools/blktap: fix params and physical-device parsing Olaf Hering
2012-04-02 20:15 ` [PATCH 04 of 18] tools/blktap: remove unneeded pointer dereferencing from img2qcow.c Olaf Hering
2012-04-02 20:15 ` [PATCH 05 of 18] tools/blktap: remove unneeded pointer dereferencing from qcow2raw.c Olaf Hering
2012-04-02 20:15 ` [PATCH 06 of 18] tools/blktap2: fix build errors caused by Werror in vhd_journal_write_entry Olaf Hering
2012-04-02 20:15 ` [PATCH 07 of 18] tools/blktap2: fix out of bounds access in block-log.c Olaf Hering
2012-04-02 20:15 ` [PATCH 08 of 18] tools/blktap2: fix build errors caused by Werror in tdqcow_get_parent_id Olaf Hering
2012-04-02 20:15 ` [PATCH 09 of 18] tools/blktap2: remove unneeded pointer dereferencing from img2qcow.c Olaf Hering
2012-04-02 20:15 ` [PATCH 10 of 18] tools/blktap2: remove unneeded pointer dereferencing from qcow2raw.c Olaf Hering
2012-04-02 20:15 ` [PATCH 11 of 18] tools/libvchan: fix function prototypes in node-select.c Olaf Hering
2012-04-02 20:15 ` [PATCH 12 of 18] tools/memshr: fix build errors caused by Werror Olaf Hering
2012-04-02 20:15 ` [PATCH 13 of 18] tools/xenpaging: fix build errors caused by -Werror Olaf Hering
2012-04-02 20:15 ` [PATCH 14 of 18] tools/libvchan: fix build errors caused by Werror in io.c Olaf Hering
2012-04-03 10:25 ` Ian Jackson
2012-04-03 10:50 ` Ian Campbell
2012-04-03 15:04 ` Olaf Hering
2012-04-03 16:39 ` Ian Campbell
2012-04-02 20:15 ` [PATCH 15 of 18] tools/blktap2: remove static string table from header file Olaf Hering
2012-04-02 20:15 ` [PATCH 16 of 18] tools/blktap2: fix build errors caused by Werror, remove blkif_op_name Olaf Hering
2012-04-02 20:15 ` [PATCH 17 of 18] tools/blktap2: remove unused labels Olaf Hering
2012-04-02 20:15 ` [PATCH 18 of 18] tools/blktap+blktap2: fix build errors caused by Werror, remove unused variables Olaf Hering
2012-04-03 13:21 ` Ian Jackson
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=569fc8260490b64ae837.1333397725@probook.site \
--to=olaf@aepfle.de \
--cc=Ian.Jackson@eu.citrix.com \
--cc=xen-devel@lists.xensource.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).