Mercurial > hg > audiodb

comparison soap.cpp @ 331:0c908093082f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed another potential NULL string de-reference in soap.cpp
author mas01mc
date Sat, 30 Aug 2008 23:35:13 +0000
parents b1c48012cd3d
children cc3f9d1ca2cd
comparison
equal deleted inserted replaced
330:b1c48012cd3d 331:0c908093082f
66 asqp.relative_threshold = relative_threshold; 66 asqp.relative_threshold = relative_threshold;
67 asqp.absolute_threshold = absolute_threshold; 67 asqp.absolute_threshold = absolute_threshold;
68 asqp.usingQueryPoint = usingQueryPoint; 68 asqp.usingQueryPoint = usingQueryPoint;
69 asqp.lsh_exact = lsh_exact; 69 asqp.lsh_exact = lsh_exact;
70 */ 70 */
71 VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME", 71 VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName);
72 strlen(trackKey)?trackKey:featureFileName);
73 soap_init(&soap); 72 soap_init(&soap);
74 if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){ 73 if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){
75 if(soap_call_adb__sequenceQueryByKey(&soap,hostport,NULL, 74 if(soap_call_adb__sequenceQueryByKey(&soap,hostport,NULL,
76 (char*)dbName, 75 (char*)dbName,
77 (char*)trackKey, 76 (char*)trackKey,
203 char trackNNStr[256]; 202 char trackNNStr[256];
204 char seqLenStr[256]; 203 char seqLenStr[256];
205 char absolute_thresholdStr[256]; 204 char absolute_thresholdStr[256];
206 char qtypeStr[256]; 205 char qtypeStr[256];
207 206
208 fprintf(stderr, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME", 207 fprintf(stderr, "Calling %s query on database %s with %s=%s\n", (trackKey&&strlen(trackKey))?"KEY":"FILENAME", dbName, (trackKey&&strlen(trackKey))?"KEY":"FILENAME",(trackKey&&strlen(trackKey))?trackKey:featureFileName);
209 strlen(trackKey)?trackKey:featureFileName);
210 208
211 /* When the branch is merged, move this to a header and use it 209 /* When the branch is merged, move this to a header and use it
212 elsewhere */ 210 elsewhere */
213 #define INTSTRINGIFY(val, str) \ 211 #define INTSTRINGIFY(val, str) \
214 snprintf(str, 256, "%d", val); 212 snprintf(str, 256, "%d", val);