Changeset 35632

Timestamp:

2021-10-18T17:33:52+13:00 (3 years ago)

Author:

davidb

Message:

Tidy up on treatment of 'string', 'char *', and 'const char*'. It was noticed that g++ was generating a warning message (warning: deprecated conversion from string constant to ‘char*’) on a call to extract_bundled_file() where a string literal was being passed as an argument. As this is C++ code, the string literal is treated as a 'const char*', however it was being passed to a function expecting a 'char *' mean the function could technically alter it if it wanted to (not easy to do -- danger, danger -- if you're a string literalfg). Of course our function doesn't do that, but the compiler isn't to know that. Simplest fix is to change our function to work with a 'const char*'. This also means some other lines of code in wrapper.cpp calling extract_bundled_file() could then loose the typecast they had for passing in a string as (char *)s.c_str()

File:

• main/trunk/release-kits/shared/linux/wrapper.cpp (modified) (3 diffs)

main/trunk/release-kits/shared/linux/wrapper.cpp

@@ -15 +15 @@
 #include "wrapper.h"
 #include "libsearch4j.h"
-bool extract_bundled_file( const char[], int, char*, bool );
+bool extract_bundled_file( const char[], int, const char*, bool );
 #else
 bool prep_java( string wd );
@@ -125 +125 @@
     //extract files
     cout << "Extracting installer jar..." << endl;
-    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), (char*)jarfile.c_str(), false);
+    succeeded = extract_bundled_file( greenstonejar, sizeof(greenstonejar), jarfile.c_str(), false);
 
     #ifdef java_is_bundled
     cout << "Preparing Greenstone installer..." << endl;
-    succeeded = extract_bundled_file( java, sizeof(java), (char*)javafile.c_str(), true ) && succeeded;
+    succeeded = extract_bundled_file( java, sizeof(java), javafile.c_str(), true ) && succeeded;
     #endif
         
@@ -219 +219 @@
 }
 #ifndef CDROM
-bool extract_bundled_file( const char data[], int size, char* filename, bool make_executable) {
+bool extract_bundled_file( const char data[], int size, const char* filename, bool make_executable) {
 
     if ( size == 0 ) return false;