Mercurial > hg > audiodb

changeset 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 a0493f861531
files soap.cpp
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/soap.cpp	Sat Aug 30 15:47:53 2008 +0000
+++ b/soap.cpp	Sat Aug 30 23:35:13 2008 +0000
@@ -68,8 +68,7 @@
       asqp.usingQueryPoint = usingQueryPoint;
       asqp.lsh_exact = lsh_exact;
   */
-  VERB_LOG(1, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
-	   strlen(trackKey)?trackKey:featureFileName);
+  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);
   soap_init(&soap);  
   if(queryType==O2_SEQUENCE_QUERY || queryType==O2_N_SEQUENCE_QUERY){
     if(soap_call_adb__sequenceQueryByKey(&soap,hostport,NULL,
@@ -205,8 +204,7 @@
   char absolute_thresholdStr[256];
   char qtypeStr[256];
 
-  fprintf(stderr, "Calling %s query on database %s with %s=%s\n", strlen(trackKey)?"KEY":"FILENAME", dbName, strlen(trackKey)?"KEY":"FILENAME",
-	   strlen(trackKey)?trackKey:featureFileName);
+  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);
 
   /* When the branch is merged, move this to a header and use it
      elsewhere */