[Scummvm-git-logs] scummvm master -> dbe2b5429852aba80b2959ab5720734f75f1002e
Strangerke
noreply at scummvm.org
Mon Feb 9 10:17:17 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
dbe2b54298 M4: remove several unused methods and a class definition in core/cstring
Commit: dbe2b5429852aba80b2959ab5720734f75f1002e
https://github.com/scummvm/scummvm/commit/dbe2b5429852aba80b2959ab5720734f75f1002e
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2026-02-09T11:17:07+01:00
Commit Message:
M4: remove several unused methods and a class definition in core/cstring
Changed paths:
engines/m4/core/cstring.cpp
engines/m4/core/cstring.h
diff --git a/engines/m4/core/cstring.cpp b/engines/m4/core/cstring.cpp
index e52586f4765..40696086627 100644
--- a/engines/m4/core/cstring.cpp
+++ b/engines/m4/core/cstring.cpp
@@ -20,7 +20,6 @@
*/
#include "common/str.h"
-#include "common/util.h"
#include "m4/core/cstring.h"
namespace M4 {
@@ -29,22 +28,6 @@ bool cstr_isdigit(char c) {
return (c >= '0' && c <= '9');
}
-bool charIsIn(char ch, char *str) {
- if (!str)
- return false;
- int16 bail = 0;
- char *mark = str;
- while (*mark) {
- if (*mark == ch)
- return true;
- ++mark;
- ++bail;
- if (bail > 256)
- return false;
- }
- return false;
-}
-
int32 cstrlen(const char *s) {
if (!s)
return 0;
@@ -86,249 +69,4 @@ char *cstrupr(char *src) {
return src;
}
-char *cstr_lower(char *src) {
- if (!src)
- return nullptr;
-
- char *mark = src;
- do {
- if (*mark >= 'A' && *mark <= 'Z')
- *mark = (char)(*mark - 'A' + 'a');
- } while (*mark++);
-
- return src;
-}
-
-int xtoi(char *string) {
- if (!string)
- return 0;
-
- int value = 0;
-
- while (*string) {
- int item = *string++;
- if (cstr_isdigit(item))
- value = (value << 4) + item - '0';
- else
- if (Common::isDigit(item))
- value = (value << 4) + toupper(item) - 'A' + 0xa;
- else
- while (*string)
- string++; // if not hexadecimal, eat string.
- }
- return (value);
-}
-
-
-/* Returns position within TARGET of string KEY (1-length) */
-
-int strpos(char *key, char *target) {
- if (!key || !target)
- return 0;
-
- char *tmp = strstr(target, key);
- if (tmp)
- return(tmp - target + 1);
-
- return 0;
-}
-
-
-/* Deletes AMOUNT characters from string INP starting at position indx */
-
-void strdel(char *inp, int indx, int count) {
- if (!inp)
- return;
-
- if (indx >= (int)strlen(inp) || !count)
- return;
-
- Common::strlcpy(&inp[indx], &inp[indx + count], count);
-}
-
-
-// Given a string, index and count, returns a substring of length count
-
-void strseg(char *work, char *work2, int indx, int count) {
- if (!work || !work2)
- return;
-
- char *s = nullptr;
-
- s = &work2[indx];
- Common::strlcpy(work, s, count);
-}
-
-
-/*
- Inserts string NEW into string WORK at character INDEX.
- INDEX is 1->strlen, not 0->strlen-1
-*/
-void strins(char *work, char *newStr, int indx) {
- if (!work || !newStr) {
- newStr = nullptr;
- return;
- }
-
- const int l1 = (strlen(work) - indx + 2);
- const int l = strlen(newStr);
- memmove(work + indx + l - 1, work + indx - 1, l1);
- memcpy(work + indx - 1, newStr, l);
-}
-
-
-void str_purge_trailing_spaces(char *myline) {
- if (!myline)
- return;
-
- int again = true;
-
- do {
- char *search = &myline[strlen(myline) - 1];
- if ((*search == 0x20) || (*search == 0x09))
- *search = 0;
- else
- again = false;
-
- search--;
- if (search < myline) again = false;
- } while (again);
-}
-
-
-void str_purge_all_spaces(char *text) {
- if (!text)
- return;
-
- str_purge_trailing_spaces(text);
-
- char *mark = text;
- while (*mark && ((*mark == ' ') || (*mark == 0x09)))
- mark++;
-
- char work[256];
- Common::strcpy_s(work, 256, mark);
- Common::strcpy_s(text, 256, work);
-}
-
-
-char *str_strip_final_lf(char *mystring) {
- if (!mystring)
- return nullptr;
-
- char *temp = strrchr(mystring, 0x0a);
- if (temp != nullptr) {
- *temp = '\0';
- }
- return (temp);
-}
-
-void str_add_final_lf(char *mystring) {
- if (!mystring)
- return;
-
- char *temp = mystring + strlen(mystring);
- *(temp++) = 0x0a;
- *temp = '\0';
-}
-
-int16 char_IsIn(char ch, char *str) {
- if (!str)
- return -1;
-
- int16 index = 0;
- char *mark = str;
-
- while (*mark) {
- if (*mark == ch)
- return index;
- ++index;
- ++mark;
- if (index > 256)
- return -1;
- }
- return -1;
-}
-
-
-// stringIsIn returns the index of the match string, or -1 if there wasn't one.
-
-int16 stringIsIn(char *str, char *strings[]) {
- if (!str || !strings)
- return -1;
-
- int16 index = 0;
- while (*strings != nullptr) {
- if (!strcmp(str, *strings))
- return index;
- ++index;
- ++strings;
- }
- return -1;
-}
-
-// dtoi
-// Converts decimal string to integer
-
-int dtoi(char *string) {
- if (!string)
- return 0;
-
- int value = 0;
- while (*string) {
- const char item = *string++;
- if (cstr_isdigit(item))
- value = (value * 10) + item - '0';
- else
- while (*string)
- string++; // if not a digit, eat string.
- }
- return (value);
-}
-
-
-// returns true if str is a positive integer, false otherwise
-
-bool stringIsInt(char *str) {
- if (!str)
- return false;
-
- int16 bail = 0;
-
- while (*str) {
- if (!cstr_isdigit(*str))
- return false;
- ++str;
- ++bail;
- if (bail > 256)
- return false;
- }
- return true;
-}
-
-bool stringIsFloat(char *str) {
- if (!str)
- return false;
-
- int16 bail = 0;
- bool decimal_seen = false;
-
- while (*str) {
- if (*str == '.') {
- if (!decimal_seen)
- decimal_seen = true;
- else return false;
- } else {
- if (!cstr_isdigit(*str))
- return false;
- }
-
- ++str;
- ++bail;
- if (bail > 256)
- return false;
- }
- return true;
-}
-
} // namespace M4
diff --git a/engines/m4/core/cstring.h b/engines/m4/core/cstring.h
index d9dad33a915..7e2611b896b 100644
--- a/engines/m4/core/cstring.h
+++ b/engines/m4/core/cstring.h
@@ -22,61 +22,16 @@
#ifndef M4_CORE_CSTRING_H
#define M4_CORE_CSTRING_H
-#include "common/str-array.h"
#include "m4/m4_types.h"
namespace M4 {
-class StringArray : public Common::StringArray {
-public:
- StringArray() : Common::StringArray() {}
-
- int indexOf(const Common::String &str) const {
- for (uint i = 0; i < size(); ++i) {
- if ((*this)[i] == str)
- return i;
- }
- return -1;
- }
-
- bool contains(const Common::String &str) const {
- return indexOf(str) != -1;
- }
- void remove(const Common::String &str) {
- int idx = indexOf(str);
- if (idx != -1)
- remove_at(idx);
- }
-};
-
#define STR_PARSE_BUFFER_SIZE 255
-bool charIsIn(char ch, char *str);
-int16 char_IsIn(char ch, char *str); //new
-int dtoi(char *string);
-bool stringIsInt(char *str);
-bool stringIsFloat(char *str);
-
-int16 stringIsIn(char *str, char *strings[]);
-
int32 cstrlen(const char *s);
void cstrcpy(char *dest, const char *src);
void cstrncpy(char *dest, const char *src, const int16 max_len);
char *cstrupr(char *src);
-char *cstr_lower(char *src);
-int xtoi(char *string);
-int strpos(char *key, char *target);
-void strdel(char *inp, int indx, int count);
-void strseg(char *work, char *work2, int indx, int count);
-void strins(char *work, char *newStr, int indx);
-void str_purge_trailing_spaces(char *myline);
-void str_purge_all_spaces(char *text);
-char *str_strip_final_lf(char *mystring);
-void str_add_final_lf(char *mystring);
-void str_parse_init(char *instring, char delimiter);
-char *str_parse(char *out);
-
-bool cstr_isdigit(char c);
#define strrun(a,b,c) memset(a,b,c)
More information about the Scummvm-git-logs
mailing list