diff options
| author | Pierre Muller <muller@ics.u-strasbg.fr> | 2007-09-26 15:37:16 +0000 |
|---|---|---|
| committer | Pierre Muller <muller@ics.u-strasbg.fr> | 2007-09-26 15:37:16 +0000 |
| commit | 8c947dc1fe6d9ee0b3dcda4363565df6f4e1f82f (patch) | |
| tree | eb54390cb69df6b293926376d0e16b95c1fbd568 /gdb/p-typeprint.c | |
| parent | 3e86a2a53a6173d6a42e9b8f188a82db93e8a539 (diff) | |
| download | gdb-8c947dc1fe6d9ee0b3dcda4363565df6f4e1f82f.tar.gz | |
2007-09-26 Pierre Muller <muller@ics.u-strasbg.fr>
* p-typeprint.c: Fix 11 ARI reported problems.
(pascal_print_type): Fix 4 operator at end of line.
(pascal_type_print_method_args) : Replace 2 DEPRECATED_STREQN macros
using strncmp function.
(pascal_type_print_base): Fix 2 operator at end of line.
(pascal_type_print_base) : Replace 3 DEPRECATED_STREQN macros
using strncmp function.
Diffstat (limited to 'gdb/p-typeprint.c')
| -rw-r--r-- | gdb/p-typeprint.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c index afd6a081b49..ac06f475730 100644 --- a/gdb/p-typeprint.c +++ b/gdb/p-typeprint.c @@ -56,23 +56,23 @@ pascal_print_type (struct type *type, char *varstring, struct ui_file *stream, if (show > 0) CHECK_TYPEDEF (type); - if ((code == TYPE_CODE_FUNC || - code == TYPE_CODE_METHOD)) + if ((code == TYPE_CODE_FUNC + || code == TYPE_CODE_METHOD)) { pascal_type_print_varspec_prefix (type, stream, show, 0); } /* first the name */ fputs_filtered (varstring, stream); - if ((varstring != NULL && *varstring != '\0') && - !(code == TYPE_CODE_FUNC || - code == TYPE_CODE_METHOD)) + if ((varstring != NULL && *varstring != '\0') + && !(code == TYPE_CODE_FUNC + || code == TYPE_CODE_METHOD)) { fputs_filtered (" : ", stream); } - if (!(code == TYPE_CODE_FUNC || - code == TYPE_CODE_METHOD)) + if (!(code == TYPE_CODE_FUNC + || code == TYPE_CODE_METHOD)) { pascal_type_print_varspec_prefix (type, stream, show, 0); } @@ -137,8 +137,8 @@ void pascal_type_print_method_args (char *physname, char *methodname, struct ui_file *stream) { - int is_constructor = DEPRECATED_STREQN (physname, "__ct__", 6); - int is_destructor = DEPRECATED_STREQN (physname, "__dt__", 6); + int is_constructor = (strncmp (physname, "__ct__", 6) == 0); + int is_destructor = (strncmp (physname, "__dt__", 6) == 0); if (is_constructor || is_destructor) { @@ -537,7 +537,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, { QUIT; /* Don't print out virtual function table. */ - if (DEPRECATED_STREQN (TYPE_FIELD_NAME (type, i), "_vptr", 5) + if ((strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0) && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5])) continue; @@ -615,8 +615,8 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, { char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); - int is_constructor = DEPRECATED_STREQN (physname, "__ct__", 6); - int is_destructor = DEPRECATED_STREQN (physname, "__dt__", 6); + int is_constructor = (strncmp (physname, "__ct__", 6) == 0); + int is_destructor = (strncmp (physname, "__dt__", 6) == 0); QUIT; if (TYPE_FN_FIELD_PROTECTED (f, j)) @@ -664,8 +664,9 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, { fprintf_filtered (stream, "destructor "); } - else if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 && - TYPE_CODE (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID) + else if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 + && TYPE_CODE (TYPE_TARGET_TYPE ( + TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID) { fprintf_filtered (stream, "function "); } @@ -679,8 +680,9 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show, method_name, stream); - if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 && - TYPE_CODE (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID) + if (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)) != 0 + && TYPE_CODE (TYPE_TARGET_TYPE ( + TYPE_FN_FIELD_TYPE (f, j))) != TYPE_CODE_VOID) { fputs_filtered (" : ", stream); type_print (TYPE_TARGET_TYPE (TYPE_FN_FIELD_TYPE (f, j)), |