[gnome-builder] gdb: avoid use of mips
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] gdb: avoid use of mips
- Date: Thu, 7 Sep 2017 19:16:35 +0000 (UTC)
commit 723a5d477fa9e626959a259f623e1611f7939502
Author: Christian Hergert <chergert redhat com>
Date: Thu Sep 7 12:14:59 2017 -0700
gdb: avoid use of mips
mips is an integer constant on GCC/mips. So we need ot be careful
to not use it here.
https://bugzilla.gnome.org/show_bug.cgi?id=787402
plugins/gdb/gdbwire.c | 22 +++++++++++-----------
plugins/gdb/gdbwire.h | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/plugins/gdb/gdbwire.c b/plugins/gdb/gdbwire.c
index 8a4845a..9776bf6 100644
--- a/plugins/gdb/gdbwire.c
+++ b/plugins/gdb/gdbwire.c
@@ -3,7 +3,7 @@
*
* This file is an amalgamation of the source files from GDBWIRE.
*
- * It was created using gdbwire 1.0 and git revision b5ae67f.
+ * It was created using gdbwire 1.0 and git revision 3c5983c.
*
* GDBWIRE is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -1685,7 +1685,7 @@ struct gdbwire_mi_parser {
/* The GDB/MI lexer state */
yyscan_t mils;
/* The GDB/MI push parser state */
- gdbwire_mi_pstate *mips;
+ gdbwire_mi_pstate *mipst;
/* The client parser callbacks */
struct gdbwire_mi_parser_callbacks callbacks;
};
@@ -1716,8 +1716,8 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
}
/* Create a new push parser state instance */
- parser->mips = gdbwire_mi_pstate_new();
- if (!parser->mips) {
+ parser->mipst = gdbwire_mi_pstate_new();
+ if (!parser->mipst) {
gdbwire_mi_lex_destroy(parser->mils);
gdbwire_string_destroy(parser->buffer);
free(parser);
@@ -1726,7 +1726,7 @@ gdbwire_mi_parser_create(struct gdbwire_mi_parser_callbacks callbacks)
/* Ensure that the callbacks are non null */
if (!callbacks.gdbwire_mi_output_callback) {
- gdbwire_mi_pstate_delete(parser->mips);
+ gdbwire_mi_pstate_delete(parser->mipst);
gdbwire_mi_lex_destroy(parser->mils);
gdbwire_string_destroy(parser->buffer);
free(parser);
@@ -1754,9 +1754,9 @@ void gdbwire_mi_parser_destroy(struct gdbwire_mi_parser *parser)
}
/* Free the push parser instance */
- if (parser->mips) {
- gdbwire_mi_pstate_delete(parser->mips);
- parser->mips = NULL;
+ if (parser->mipst) {
+ gdbwire_mi_pstate_delete(parser->mipst);
+ parser->mipst = NULL;
}
free(parser);
@@ -1807,7 +1807,7 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser,
pattern = gdbwire_mi_lex(parser->mils);
if (pattern == 0)
break;
- mi_status = gdbwire_mi_push_parse(parser->mips, pattern, NULL,
+ mi_status = gdbwire_mi_push_parse(parser->mipst, pattern, NULL,
parser->mils, &output);
} while (mi_status == YYPUSH_MORE);
@@ -1819,8 +1819,8 @@ gdbwire_mi_parser_parse_line(struct gdbwire_mi_parser *parser,
* - 0 if parsing was successful (return is due to end-of-input).
* - 1 if parsing failed because of invalid input, i.e., input
* that contains a syntax error or that causes YYABORT to be invoked.
- * - 2 if parsing failed due to memory exhaustion.
- * - YYPUSH_MORE if more input is required to finish parsing the grammar.
+ * - 2 if parsing failed due to memory exhaustion.
+ * - YYPUSH_MORE if more input is required to finish parsing the grammar.
* Anything besides this would be unexpected.
*
* The grammar is designed to accept an infinate list of GDB/MI
diff --git a/plugins/gdb/gdbwire.h b/plugins/gdb/gdbwire.h
index 4e96082..f5506b5 100644
--- a/plugins/gdb/gdbwire.h
+++ b/plugins/gdb/gdbwire.h
@@ -3,7 +3,7 @@
*
* This file is an amalgamation of the source files from GDBWIRE.
*
- * It was created using gdbwire 1.0 and git revision b5ae67f.
+ * It was created using gdbwire 1.0 and git revision 3c5983c.
*
* GDBWIRE is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]