Changeset 898eb15 for global.c

Timestamp:

Jul 24, 2009, 12:59:23 AM (16 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

ab225e0

Parents:

004d683

git-author:

Anders Kaseorg <andersk@mit.edu> (07/23/09 23:17:32)

git-committer:

Anders Kaseorg <andersk@mit.edu> (07/24/09 00:59:23)

Message:

Lose g->searchactive in favor of g->searchstring != NULL.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• global.c (modified) (2 diffs)

global.c

@@ -65 +65 @@
   owl_fmtext_init_colorpair_mgr(&(g->cpmgr));
   g->debug=OWL_DEBUG;
-  g->searchactive=0;
   g->searchstring=NULL;
   g->starttime=time(NULL); /* assumes we call init only a start time */
@@ -709 +708 @@
 
 int owl_global_is_search_active(owl_global *g) {
-  if (g->searchactive) return(1);
-  return(0);
-}
-
-void owl_global_set_search_active(owl_global *g, char *string) {
-  g->searchactive=1;
+  if (g->searchstring != NULL) return(1);
+  return(0);
+}
+
+void owl_global_set_search_string(owl_global *g, char *string) {
   if (g->searchstring != NULL) owl_free(g->searchstring);
-  g->searchstring=owl_strdup(string);
-}
-
-void owl_global_set_search_inactive(owl_global *g) {
-  g->searchactive=0;
+  g->searchstring = string ? owl_strdup(string) : NULL;
 }