comparison audioDB.cpp @ 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).

 
 bool operator==(const PointPair& a, const PointPair& b){
   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");
     cmdline_parser_print_version ();
     if (strlen(gengetopt_args_info_purpose) > 0)

   
   else
     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
     processArgs(argc, argv);
     // Perform database prefix substitution

     cleanup();
     throw(err);
   }
 }
 
-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
     processArgs(argc, argv);
     // Perform database prefix substitution

     cleanup();
     throw(err);
   }
 }
 
-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
     processArgs(argc, argv); 
     // Perform database prefix substitution

   }
 }
 
 
 //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 {
         UseApiError=1;
 

     return;
 
 }
 
 //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 {
         UseApiError=1;
 

 
 }
 
 
 //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 {
         UseApiError=1;
 

 
 audioDB::~audioDB(){
   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 ();
     if (strlen(gengetopt_args_info_purpose) > 0)
       printf("%s\n", gengetopt_args_info_purpose);

   VERB_LOG(2, " done.");
 }
 
 // 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
   audioDB(argc, argv);
 }

 #include "audioDB_API.h"
 
 
     //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];
         char tempstr3[200];
         int apierror=0;

     }
 
 
 
   int audiodb_insert(adb_ptr mydb, adb_insert_ptr ins) {
-    char *argv[15];
+    const char *argv[15];
     int argvctr=0;
     int apierror=0;
 
     argv[argvctr++]="audioDB";
     argv[argvctr++]="-I";

   }
 
 
   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;
     char tempfeaturename[]="tempfeatureXXXXXX";
     char temppowername[]="temppowerXXXXXX";

   }
 
 
   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];
     char tempstr3[200];
     int apierror=0;

   int audiodb_status(adb_ptr mydb, adb_status_ptr status){
 
       cppstatus sss;
       int apierror=0;
 
-      char * argv[5];
+      const char *argv[5];
 
       apierror=0;
       argv[0]="audioDB";
       argv[1]="--STATUS";
       argv[2]="-d";

       return audiodb_dump_withdir(mydb,"audioDB.dump");
   }
 
   int audiodb_dump_withdir(adb_ptr mydb, char * outputdir){
 
-      char * argv[7];
+      const char *argv[7];
       int argvctr=0;
       int apierror=0;
 
       argv[argvctr++]="audioDB";
       argv[argvctr++]="--DUMP";

       return apierror;
   }
 
   int audiodb_l2norm(adb_ptr mydb){
 
-      char * argv[5];
+      const char *argv[5];
       int apierror=0;
 
       argv[0]="audioDB";
       argv[1]="--L2NORM";
       argv[2]="-d";

       return apierror;
   }
 
   int audiodb_power(adb_ptr mydb){
 
-      char * argv[5];
+      const char *argv[5];
       int apierror=0;
 
       argv[0]="audioDB";
       argv[1]="--POWER";
       argv[2]="-d";