From patchwork Tue Apr 4 17:25:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 19835 Received: (qmail 41645 invoked by alias); 4 Apr 2017 17:31:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 41627 invoked by uid 89); 4 Apr 2017 17:31:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=358, communication X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 04 Apr 2017 17:31:42 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2887E7E9D8 for ; Tue, 4 Apr 2017 17:26:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 2887E7E9D8 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=palves@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 2887E7E9D8 Received: from cascais.lan (ovpn04.gateway.prod.ext.phx2.redhat.com [10.5.9.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9BE618247 for ; Tue, 4 Apr 2017 17:26:07 +0000 (UTC) From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 10/18] -Wwrite-strings: gdbserver's 'port' parsing Date: Tue, 4 Apr 2017 18:25:43 +0100 Message-Id: <1491326751-16180-11-git-send-email-palves@redhat.com> In-Reply-To: <1491326751-16180-1-git-send-email-palves@redhat.com> References: <1491326751-16180-1-git-send-email-palves@redhat.com> -Wwrite-strings flags this assignment as requiring a cast: port = STDIO_CONNECTION_NAME; because 'port' is a "char *", and STDIO_CONNECTION_NAME is a string literal. gdb/gdbserver/ChangeLog: yyyy-mm-dd Pedro Alves * remote-utils.c (remote_prepare, remote_open): Constify. * remote-utils.h (remote_prepare, remote_open): Constify. * server.c (captured_main): Constify 'port' handling. --- gdb/gdbserver/remote-utils.c | 8 ++++---- gdb/gdbserver/remote-utils.h | 4 ++-- gdb/gdbserver/server.c | 13 +++++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index 6a2cc04..37a6402 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -217,9 +217,9 @@ handle_accept_event (int err, gdb_client_data client_data) NAME is the filename used for communication. */ void -remote_prepare (char *name) +remote_prepare (const char *name) { - char *port_str; + const char *port_str; #ifdef USE_WIN32API static int winsock_initialized; #endif @@ -284,9 +284,9 @@ remote_prepare (char *name) NAME is the filename used for communication. */ void -remote_open (char *name) +remote_open (const char *name) { - char *port_str; + const char *port_str; port_str = strchr (name, ':'); #ifdef USE_WIN32API diff --git a/gdb/gdbserver/remote-utils.h b/gdb/gdbserver/remote-utils.h index 9db46be..b3eab3b 100644 --- a/gdb/gdbserver/remote-utils.h +++ b/gdb/gdbserver/remote-utils.h @@ -35,8 +35,8 @@ int putpkt (char *buf); int putpkt_binary (char *buf, int len); int putpkt_notif (char *buf); int getpkt (char *buf); -void remote_prepare (char *name); -void remote_open (char *name); +void remote_prepare (const char *name); +void remote_open (const char *name); void remote_close (void); void write_ok (char *buf); void write_enn (char *buf); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 4bc7f71..51f6a28 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -3511,7 +3511,8 @@ captured_main (int argc, char *argv[]) { int bad_attach; int pid; - char *arg_end, *port; + char *arg_end; + const char *port = NULL; char **next_arg = &argv[1]; volatile int multi_mode = 0; volatile int attach = 0; @@ -3608,7 +3609,8 @@ captured_main (int argc, char *argv[]) { /* "-" specifies a stdio connection and is a form of port specification. */ - *next_arg = STDIO_CONNECTION_NAME; + port = STDIO_CONNECTION_NAME; + next_arg++; break; } else if (strcmp (*next_arg, "--disable-randomization") == 0) @@ -3627,8 +3629,11 @@ captured_main (int argc, char *argv[]) continue; } - port = *next_arg; - next_arg++; + if (port == NULL) + { + port = *next_arg; + next_arg++; + } if (port == NULL || (!attach && !multi_mode && *next_arg == NULL)) { gdbserver_usage (stderr);