From 13b6469ab9c2dcda7787dc258c4ffe67f9f249e8 Mon Sep 17 00:00:00 2001 From: "Eric J. Korpela" Date: Tue, 17 Jun 2003 01:03:45 +0000 Subject: [PATCH] Added const constraint to the constant parameters increase class compatibility. svn path=/trunk/boinc/; revision=1508 --- lib/parse.C | 20 ++++++++++---------- lib/parse.h | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/parse.C b/lib/parse.C index 0bee016b4b..0f133d703e 100644 --- a/lib/parse.C +++ b/lib/parse.C @@ -38,12 +38,12 @@ // return true if the tag appears in the line // -bool match_tag(char* buf, char* tag) { +bool match_tag(const char* buf, const char* tag) { if (strstr(buf, tag)) return true; return false; } -bool match_tag(const std::string &s, char* tag) { +bool match_tag(const std::string &s, const char* tag) { if (s.find(tag) != std::string::npos) return true; return false; } @@ -52,7 +52,7 @@ bool match_tag(const std::string &s, char* tag) { // return true if it's there // Note: this doesn't check for the end tag // -bool parse_int(char* buf, char* tag, int& x) { +bool parse_int(const char* buf, const char* tag, int& x) { char* p = strstr(buf, tag); if (!p) return false; x = strtol(p+strlen(tag), 0, 0); // this parses 0xabcd correctly @@ -61,7 +61,7 @@ bool parse_int(char* buf, char* tag, int& x) { // Same, for doubles // -bool parse_double(char* buf, char* tag, double& x) { +bool parse_double(const char* buf, const char* tag, double& x) { char* p = strstr(buf, tag); if (!p) return false; x = atof(p+strlen(tag)); @@ -70,7 +70,7 @@ bool parse_double(char* buf, char* tag, double& x) { // parse a string of the form string // -bool parse_str(char* buf, char* tag, char* dest, int len) { +bool parse_str(const char* buf, const char* tag, char* dest, int len) { char* p = strstr(buf, tag); if (!p) return false; p = strchr(p, '>'); @@ -84,7 +84,7 @@ bool parse_str(char* buf, char* tag, char* dest, int len) { // parse a string of the form name="string" // -void parse_attr(char* buf, char* name, char* dest, int len) { +void parse_attr(const char* buf, const char* name, char* dest, int len) { char* p, *q; strcpy(dest, ""); @@ -121,7 +121,7 @@ void strcatdup(char*& p, char* buf) { // copy from a file to a malloc'd string until the end tag is reached // -int dup_element_contents(FILE* in, char* end_tag, char** pp) { +int dup_element_contents(FILE* in, const char* end_tag, char** pp) { char buf[256]; char* p = strdup(""); @@ -138,7 +138,7 @@ int dup_element_contents(FILE* in, char* end_tag, char** pp) { // copy from a file to static buffer // -int copy_element_contents(FILE* in, char* end_tag, char* p, int len) { +int copy_element_contents(FILE* in, const char* end_tag, char* p, int len) { char buf[256]; strcpy(p, ""); @@ -154,7 +154,7 @@ int copy_element_contents(FILE* in, char* end_tag, char* p, int len) { // read a file into a malloc'd string // -int read_file_malloc(char* pathname, char*& str) { +int read_file_malloc(const char* pathname, char*& str) { char buf[256]; FILE* f; @@ -189,7 +189,7 @@ void replace_element(char* buf, char* start, char* end, char* replacement) { // then return the contents of that element. // Otherwise strip out all elements // -void extract_venue(char* in, char* venue_name, char* out) { +void extract_venue(const char* in, const char* venue_name, char* out) { char* p, *q; char buf[256]; sprintf(buf, "", venue_name); diff --git a/lib/parse.h b/lib/parse.h index 9adf8c1f61..e9909246b0 100644 --- a/lib/parse.h +++ b/lib/parse.h @@ -21,20 +21,20 @@ #include #include -extern bool parse(char*, char*); -extern bool parse_int(char*, char*, int&); -extern bool parse_double(char*, char*, double&); -extern bool parse_str(char*, char*, char*, int); +extern bool parse(char* , char* ); +extern bool parse_int(const char* buf, const char*tag, int&); +extern bool parse_double(const char*, const char*, double&); +extern bool parse_str(const char*, const char*, char*, int); extern void parse_attr(char* buf, char* attrname, char* out, int len); -extern bool match_tag(char*, char*); -extern bool match_tag(const std::string &, char*); +extern bool match_tag(const char*, const char*); +extern bool match_tag(const std::string &, const char*); extern void copy_stream(FILE* in, FILE* out); extern void strcatdup(char*& p, char* buf); -extern int dup_element_contents(FILE* in, char* end_tag, char** pp); -extern int copy_element_contents(FILE* in, char* end_tag, char* p, int len); -extern int read_file_malloc(char* pathname, char*& str); +extern int dup_element_contents(FILE* in, const char* end_tag, char** pp); +extern int copy_element_contents(FILE* in, const char* end_tag, char* p, int len); +extern int read_file_malloc(const char* pathname, char*& str); extern void replace_element(char* buf, char* start, char* end, char* replacement); -extern void extract_venue(char* in, char* venue_name, char* out); +extern void extract_venue(const char* in, const char* venue_name, char* out); extern char* sgets(char* buf, int len, char* &in); extern bool extract_xml_record(const std::string &field, const char *tag, std::string &record);