Mercurial > hg > audiodb
comparison soap.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).
author | mas01cr |
---|---|
date | Wed, 12 Nov 2008 13:05:10 +0000 |
parents | 4871a3ed9e36 |
children | 17003dff8127 add65705e655 |
comparison
equal
deleted
inserted
replaced
358:7b5633e55284 | 359:d72ff5d0292f |
---|---|
141 char str[256]; \ | 141 char str[256]; \ |
142 snprintf(str, 256, "%f", val); | 142 snprintf(str, 256, "%f", val); |
143 | 143 |
144 /* Server definitions */ | 144 /* Server definitions */ |
145 int adb__status(struct soap* soap, xsd__string dbName, adb__statusResponse &adbStatusResponse){ | 145 int adb__status(struct soap* soap, xsd__string dbName, adb__statusResponse &adbStatusResponse){ |
146 const char *const argv[]={"./audioDB",COM_STATUS,"-d",dbName}; | 146 const char *argv[]={"./audioDB",COM_STATUS,"-d",dbName}; |
147 const unsigned argc = 4; | 147 const unsigned argc = 4; |
148 try { | 148 try { |
149 audioDB(argc, argv, &adbStatusResponse); | 149 audioDB(argc, argv, &adbStatusResponse); |
150 return SOAP_OK; | 150 return SOAP_OK; |
151 } catch(char *err) { | 151 } catch(char *err) { |
158 adb__lisztResponse& adbLisztResponse){ | 158 adb__lisztResponse& adbLisztResponse){ |
159 | 159 |
160 INTSTRINGIFY(lisztOffset, lisztOffsetStr); | 160 INTSTRINGIFY(lisztOffset, lisztOffsetStr); |
161 INTSTRINGIFY(lisztLength, lisztLengthStr); | 161 INTSTRINGIFY(lisztLength, lisztLengthStr); |
162 | 162 |
163 const char* const argv[] = {"./audioDB", COM_LISZT, "-d",dbName, "--lisztOffset", lisztOffsetStr, "--lisztLength", lisztLengthStr}; | 163 const char *argv[] = {"./audioDB", COM_LISZT, "-d",dbName, "--lisztOffset", lisztOffsetStr, "--lisztLength", lisztLengthStr}; |
164 const unsigned argc = 8; | 164 const unsigned argc = 8; |
165 try{ | 165 try{ |
166 audioDB(argc, argv, &adbLisztResponse); | 166 audioDB(argc, argv, &adbLisztResponse); |
167 return SOAP_OK; | 167 return SOAP_OK; |
168 } catch(char *err) { | 168 } catch(char *err) { |
281 argv[argv_counter++] = COM_LSH_EXACT; | 281 argv[argv_counter++] = COM_LSH_EXACT; |
282 } | 282 } |
283 argv[argv_counter] = NULL; | 283 argv[argv_counter] = NULL; |
284 | 284 |
285 try { | 285 try { |
286 audioDB(argc, (char* const*)argv, &adbQueryResponse); | 286 audioDB(argc, argv, &adbQueryResponse); |
287 delete [] argv; | 287 delete [] argv; |
288 return SOAP_OK; | 288 return SOAP_OK; |
289 } catch (char *err) { | 289 } catch (char *err) { |
290 soap_receiver_fault(soap, err, ""); | 290 soap_receiver_fault(soap, err, ""); |
291 delete [] argv; | 291 delete [] argv; |
349 | 349 |
350 const unsigned argc = 22; | 350 const unsigned argc = 22; |
351 | 351 |
352 | 352 |
353 try { | 353 try { |
354 audioDB(argc, (char* const*)argv, &adbQueryResponse); | 354 audioDB(argc, argv, &adbQueryResponse); |
355 return SOAP_OK; | 355 return SOAP_OK; |
356 } catch (char *err) { | 356 } catch (char *err) { |
357 soap_receiver_fault(soap, err, ""); | 357 soap_receiver_fault(soap, err, ""); |
358 return SOAP_FAULT; | 358 return SOAP_FAULT; |
359 } | 359 } |