changeset 359:d72ff5d0292f gcc-4.3-cleanups

YET MORE CONST-CORRECTNESS.

The pain and suffering involved is endless.  However, these changes at
least make all the stupid warnings about deprecated conversions go away.

(I confess to a little bit of cargo-cult programming here; I can't keep
in my brain the differences between const char*, char *const and
const*const char all at once).

--- a/audioDB.cpp	Wed Nov 12 13:05:09 2008 +0000
+++ b/audioDB.cpp	Wed Nov 12 13:05:10 2008 +0000
@@ -22,7 +22,7 @@
   return ( (a.trackID==b.trackID) && (a.qpos==b.qpos) && (a.spos==b.spos) );
 }
 
-audioDB::audioDB(const unsigned argc, const char *const argv[]): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[]): O2_AUDIODB_INITIALIZERS
 {
   if(processArgs(argc, argv)<0){
     printf("No command found.\n");
@@ -113,7 +113,7 @@
     error("Unrecognized command",command);
 }
 
-audioDB::audioDB(const unsigned argc, const char *const argv[], adb__queryResponse *adbQueryResponse): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[], adb__queryResponse *adbQueryResponse): O2_AUDIODB_INITIALIZERS
 {
   try {
     isServer = 1; // Set to make errors report over SOAP
@@ -129,7 +129,7 @@
   }
 }
 
-audioDB::audioDB(const unsigned argc, const char* const argv[], adb__statusResponse *adbStatusResponse): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[], adb__statusResponse *adbStatusResponse): O2_AUDIODB_INITIALIZERS
 {
   try {
     isServer = 1; // Set to make errors report over SOAP
@@ -145,7 +145,7 @@
   }
 }
 
-audioDB::audioDB(const unsigned argc, const char *const argv[], adb__lisztResponse *adbLisztResponse): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[], adb__lisztResponse *adbLisztResponse): O2_AUDIODB_INITIALIZERS
 {
   try {
     isServer = 1; // Set to make errors report over SOAP
@@ -163,7 +163,7 @@
 
 
 //for the lib / API
-audioDB::audioDB(const unsigned argc, char* const argv[], int * apierror): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[], int * apierror): O2_AUDIODB_INITIALIZERS
 {
 
     try {
@@ -228,7 +228,7 @@
 }
 
 //for API status
-audioDB::audioDB(const unsigned argc, char* const argv[], cppstatusptr stat, int * apierror): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[], cppstatusptr stat, int * apierror): O2_AUDIODB_INITIALIZERS
 {
 
     try {
@@ -262,7 +262,7 @@
 
 
 //for API query
-audioDB::audioDB(const unsigned argc, char* const argv[],adb__queryResponse *adbQueryResponse, int * apierror): O2_AUDIODB_INITIALIZERS
+audioDB::audioDB(const unsigned argc, const char *argv[],adb__queryResponse *adbQueryResponse, int * apierror): O2_AUDIODB_INITIALIZERS
 {
 
     try {
@@ -344,7 +344,7 @@
   cleanup();
 }
 
-int audioDB::processArgs(const unsigned argc, const char *const argv[]){
+int audioDB::processArgs(const unsigned argc, const char *argv[]){
 
   if(argc<2){
     cmdline_parser_print_version ();
@@ -887,7 +887,7 @@
 
 // This entry point is visited once per instance
 // so it is a good place to set any global state variables
-int main(const int argc, char* const argv[]){
+int main(const int argc, const char* argv[]){
   SERVER_LSH_INDEX_SINGLETON = 0; // Initialize global variables
   SERVER_ADB_ROOT = 0;            // Server-side database root prefix
   SERVER_ADB_FEATURE_ROOT = 0;    // Server-side features root prefix
@@ -906,7 +906,7 @@
 
     //adb_ptr audiodb_create(char * path,long ntracks, long datadim) {
     adb_ptr audiodb_create(char * path,long datasize,long ntracks, long datadim) {
-        char *argv[12];
+        const char *argv[12];
         int argvctr=0;
         char tempstr1[200];
         char tempstr2[200];
@@ -952,7 +952,7 @@
 
 
   int audiodb_insert(adb_ptr mydb, adb_insert_ptr ins) {
-    char *argv[15];
+    const char *argv[15];
     int argvctr=0;
     int apierror=0;
 
@@ -986,7 +986,7 @@
 
   int audiodb_batchinsert(adb_ptr mydb, adb_insert_ptr ins, unsigned int size) {
 
-    char *argv[22];
+    const char *argv[22];
     int argvctr=0;
     unsigned int i=0;
     int retval=0;
@@ -1135,7 +1135,7 @@
 
   int audiodb_query(adb_ptr mydb, adb_query_ptr adbq, adb_queryresult_ptr adbqr){
 
-    char *argv[32];
+    const char *argv[32];
     int argvctr=0;
     char tempstr1[200];
     char tempstr2[200];
@@ -1248,7 +1248,7 @@
       cppstatus sss;
       int apierror=0;
 
-      char * argv[5];
+      const char *argv[5];
 
       apierror=0;
       argv[0]="audioDB";
@@ -1275,7 +1275,7 @@
 
   int audiodb_dump_withdir(adb_ptr mydb, char * outputdir){
 
-      char * argv[7];
+      const char *argv[7];
       int argvctr=0;
       int apierror=0;
 
@@ -1294,7 +1294,7 @@
 
   int audiodb_l2norm(adb_ptr mydb){
 
-      char * argv[5];
+      const char *argv[5];
       int apierror=0;
 
       argv[0]="audioDB";
@@ -1309,7 +1309,7 @@
 
   int audiodb_power(adb_ptr mydb){
 
-      char * argv[5];
+      const char *argv[5];
       int apierror=0;
 
       argv[0]="audioDB";

--- a/audioDB.h	Wed Nov 12 13:05:09 2008 +0000
+++ b/audioDB.h	Wed Nov 12 13:05:10 2008 +0000
@@ -333,18 +333,18 @@
   void prefix_name(char** const name, const char* prefix);
 
  public:
-  audioDB(const unsigned argc, const char *const argv[]);
-  audioDB(const unsigned argc, const char *const argv[], adb__queryResponse *adbQueryResponse);
-  audioDB(const unsigned argc, const char *const argv[], adb__statusResponse *adbStatusResponse);
-  audioDB(const unsigned argc, const char *const argv[], adb__lisztResponse *adbLisztResponse);
-  audioDB(const unsigned argc, char* const argv[], int * apierror);
-  audioDB(const unsigned argc, char* const argv[], cppstatusptr stat, int * apierror);
-  audioDB(const unsigned argc, char* const argv[],adb__queryResponse *adbQueryResponse, int * apierror);
+  audioDB(const unsigned argc, const char *argv[]);
+  audioDB(const unsigned argc, const char *argv[], adb__queryResponse *adbQueryResponse);
+  audioDB(const unsigned argc, const char *argv[], adb__statusResponse *adbStatusResponse);
+  audioDB(const unsigned argc, const char *argv[], adb__lisztResponse *adbLisztResponse);
+  audioDB(const unsigned argc, const char *argv[], int * apierror);
+  audioDB(const unsigned argc, const char *argv[], cppstatusptr stat, int * apierror);
+  audioDB(const unsigned argc, const char *argv[],adb__queryResponse *adbQueryResponse, int * apierror);
 
 
   void cleanup();
   ~audioDB();
-  int processArgs(const unsigned argc, const char* const argv[]);
+  int processArgs(const unsigned argc, const char* argv[]);
   void get_lock(int fd, bool exclusive);
   void release_lock(int fd);
   void create(const char* dbName);

--- a/soap.cpp	Wed Nov 12 13:05:09 2008 +0000
+++ b/soap.cpp	Wed Nov 12 13:05:10 2008 +0000
@@ -143,7 +143,7 @@
 
 /* Server definitions */
 int adb__status(struct soap* soap, xsd__string dbName, adb__statusResponse &adbStatusResponse){
-  const char *const argv[]={"./audioDB",COM_STATUS,"-d",dbName};
+  const char *argv[]={"./audioDB",COM_STATUS,"-d",dbName};
   const unsigned argc = 4;
   try {
     audioDB(argc, argv, &adbStatusResponse);
@@ -160,7 +160,7 @@
   INTSTRINGIFY(lisztOffset, lisztOffsetStr);
   INTSTRINGIFY(lisztLength, lisztLengthStr);
 
-  const char* const argv[] = {"./audioDB", COM_LISZT, "-d",dbName, "--lisztOffset", lisztOffsetStr, "--lisztLength", lisztLengthStr};
+  const char *argv[] = {"./audioDB", COM_LISZT, "-d",dbName, "--lisztOffset", lisztOffsetStr, "--lisztLength", lisztLengthStr};
   const unsigned argc = 8;
   try{
     audioDB(argc, argv, &adbLisztResponse);
@@ -283,7 +283,7 @@
   argv[argv_counter] = NULL;
 
   try {
-    audioDB(argc, (char* const*)argv, &adbQueryResponse);
+    audioDB(argc, argv, &adbQueryResponse);
     delete [] argv;
     return SOAP_OK;
   } catch (char *err) {
@@ -351,7 +351,7 @@
   
  
   try {
-    audioDB(argc, (char* const*)argv, &adbQueryResponse);
+    audioDB(argc, argv, &adbQueryResponse);
     return SOAP_OK;
   } catch (char *err) {
     soap_receiver_fault(soap, err, "");