Changeset 7381 for trunk/gsdl/src/recpt/z3950server.cpp

Timestamp:

2004-05-24T15:34:40+12:00 (20 years ago)

Author:

mdewsnip

Message:

(Human Info) Now delete all char* variables from text_t.getcstr() function with delete[] variable, and all "" are now g_EmptyText (const text_t("")).

File:

• trunk/gsdl/src/recpt/z3950server.cpp (modified) (6 diffs)

trunk/gsdl/src/recpt/z3950server.cpp

@@ -45 +45 @@
   meta["hastxt"]="1";
   // for now, assume we don't want ANY DocumentButtons.
-  format["DocumentButtons"]="";
+  format["DocumentButtons"]=g_EmptyText;
 }
 
@@ -88 +88 @@
   char* name_str=info->name.getcstr();
   int retval=z_cmd_open(serv_str,name_str);
-  delete serv_str;
-  delete name_str;
+  delete []serv_str;
+  delete []name_str;
   if (retval==1)
     // we got a connection error
@@ -175 +175 @@
     parsed_query+=ptr;
   }
-  delete ptr;
+  delete []ptr;
 }
 
@@ -218 +218 @@
   
 
-  text_t expanded_query="";
+  text_t expanded_query=g_EmptyText;
   parseQuery(query,querytype,fields,expanded_query);
 
@@ -224 +224 @@
   // following functions defined in yaz_zclient.c
   *nummatches=z_cmd_dosearch(query_str); // returns # found, -1 on err.
-  delete query_str;
+  delete []query_str;
   if (*nummatches<=0) {
     if (*nummatches==0) {
@@ -289 +289 @@
     // query again.
 
-    text_t expanded_query="";
+    text_t expanded_query=g_EmptyText;
     parseQuery(query,querytype,fields,expanded_query);
 
     char* query_str=expanded_query.getcstr();
     int returned=z_cmd_dosearch(query_str);
-    delete query_str;
+    delete []query_str;
     if (returned<=0) {
       // 0 => none.