From a0463dfa8fe232d01ea925668f393d7507fa787b Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Wed, 4 Jul 2018 12:27:41 +0200 Subject: Renamed the function providing next character from input buffers. --- plugins/dexbnf/shorty.c | 6 +++--- plugins/dexbnf/type.c | 8 ++++---- src/common/ibuf.c | 2 +- src/common/ibuf.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/dexbnf/shorty.c b/plugins/dexbnf/shorty.c index b8bb158..434aa3b 100644 --- a/plugins/dexbnf/shorty.c +++ b/plugins/dexbnf/shorty.c @@ -78,9 +78,9 @@ GBinRoutine *dsd_shorty_descriptor(input_buffer *buffer) /* Arguments */ - for (ahead = text_input_buffer_next_char(buffer); + for (ahead = get_input_buffer_next_char(buffer); ahead != '\0'; - ahead = text_input_buffer_next_char(buffer)) + ahead = get_input_buffer_next_char(buffer)) { type = dsd_shorty_field_type(buffer, ahead); @@ -132,7 +132,7 @@ static GDataType *dsd_shorty_return_type(input_buffer *buffer) * */ - ahead = text_input_buffer_next_char(buffer); + ahead = get_input_buffer_next_char(buffer); if (ahead == 'V') result = g_basic_type_new(BTP_VOID); diff --git a/plugins/dexbnf/type.c b/plugins/dexbnf/type.c index ff9af09..a6ce838 100644 --- a/plugins/dexbnf/type.c +++ b/plugins/dexbnf/type.c @@ -93,7 +93,7 @@ static GDataType *dtd_full_class_name(input_buffer *buffer) { save_input_buffer_pos(buffer, &saved); - next = text_input_buffer_next_char(buffer); + next = get_input_buffer_next_char(buffer); if (next != '/') { @@ -151,7 +151,7 @@ GDataType *dtd_type_descriptor(input_buffer *buffer) * */ - ahead = text_input_buffer_next_char(buffer); + ahead = get_input_buffer_next_char(buffer); if (ahead == 'V') result = g_basic_type_new(BTP_VOID); @@ -197,7 +197,7 @@ static GDataType *dtd_field_type_descriptor(input_buffer *buffer, char ahead) while (ahead == '[') { dim++; - ahead = text_input_buffer_next_char(buffer); + ahead = get_input_buffer_next_char(buffer); } descriptor = dtd_non_array_field_type_descriptor(buffer, ahead); @@ -299,7 +299,7 @@ static GDataType *dtd_non_array_field_type_descriptor(input_buffer *buffer, char if (result != NULL) { - check = text_input_buffer_next_char(buffer); + check = get_input_buffer_next_char(buffer); if (check != ';') { diff --git a/src/common/ibuf.c b/src/common/ibuf.c index 5d90eb4..07c5487 100644 --- a/src/common/ibuf.c +++ b/src/common/ibuf.c @@ -259,7 +259,7 @@ char peek_input_buffer_next_char(const input_buffer *ibuf) * * ******************************************************************************/ -char text_input_buffer_next_char(input_buffer *ibuf) +char get_input_buffer_next_char(input_buffer *ibuf) { char result; /* Valeur à retourner */ diff --git a/src/common/ibuf.h b/src/common/ibuf.h index ecd8814..b60d1ea 100644 --- a/src/common/ibuf.h +++ b/src/common/ibuf.h @@ -74,7 +74,7 @@ char peek_input_buffer_char(const input_buffer *); char peek_input_buffer_next_char(const input_buffer *); /* Fournit et avance la tête de lecture courante. */ -char text_input_buffer_next_char(input_buffer *); +char get_input_buffer_next_char(input_buffer *); /* Fournit et avance la tête de lecture courante, si possible. */ bool get_input_buffer_next_char_carefully(input_buffer *, char *); -- cgit v0.11.2-87-g4458