This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 2/6] listing.c: misc constification of strings
- From: tbsaunde+binutils at tbsaunde dot org
- To: binutils at sourceware dot org
- Date: Tue, 16 Feb 2016 22:54:18 -0500
- Subject: [PATCH 2/6] listing.c: misc constification of strings
- Authentication-results: sourceware.org; auth=none
- References: <1455681262-11896-1-git-send-email-tbsaunde+binutils at tbsaunde dot org>
From: Trevor Saunders <tbsaunde@tbsaunde.org>
gas/ChangeLog:
2016-02-16 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* listing.c (print_source): Make type of p const char *.
(print_line): Make type of string const
char *.
(buffer_line): Return const char *.
(title): Make type const char *.
(subtitle): Likewise.
(listing_listing): Make type of p const char *.
---
gas/listing.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/gas/listing.c b/gas/listing.c
index eeb349a..5898c0e 100644
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -223,7 +223,8 @@ static file_info_type *file_info (const char *);
static void new_frag (void);
static void listing_page (list_info_type *);
static unsigned int calc_hex (list_info_type *);
-static void print_lines (list_info_type *, unsigned int, char *, unsigned int);
+static void print_lines (list_info_type *, unsigned int, const char *,
+ unsigned int);
static void list_symbol_table (void);
static int debugging_pseudo (list_info_type *, const char *);
static void listing_listing (char *);
@@ -472,7 +473,7 @@ listing_prev_line (void)
truncated to size. It appends a fake line to the end of each input
file to make using the returned buffer simpler. */
-static char *
+static const char *
buffer_line (file_info_type *file, char *line, unsigned int size)
{
unsigned int count = 0;
@@ -698,8 +699,8 @@ static const char *fn;
static unsigned int eject; /* Eject pending */
static unsigned int page; /* Current page number */
-static char *title; /* Current title */
-static char *subtitle; /* Current subtitle */
+static const char *title; /* Current title */
+static const char *subtitle; /* Current subtitle */
static unsigned int on_page; /* Number of lines printed on current page */
static void
@@ -832,7 +833,7 @@ calc_hex (list_info_type *list)
static void
print_lines (list_info_type *list, unsigned int lineno,
- char *string, unsigned int address)
+ const char *string, unsigned int address)
{
unsigned int idx;
unsigned int nchars;
@@ -1095,7 +1096,7 @@ print_source (file_info_type * current_file,
while (current_file->linenum < list->hll_line
&& !current_file->at_end)
{
- char *p;
+ const char *p;
cache = cached_lines + next_free_line;
cache->file = current_file;
@@ -1202,7 +1203,7 @@ listing_listing (char *name ATTRIBUTE_UNUSED)
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
char *buffer;
- char *p;
+ const char *p;
int show_listing = 1;
unsigned int width;
--
2.7.0