Changeset 8dfb59c

Timestamp:

Mar 23, 2010, 5:23:43 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

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

Children:

38cc669

Parents:

1b1cd2c

git-author:

Nelson Elhage <nelhage@mit.edu> (03/04/10 09:41:04)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/23/10 17:23:43)

Message:

Nuke the editwin buffercommand.

This was really just an alternate name for callback data that was
known to be a string. Now that we can safely pass callback data that
needs to be destroyed, it's redundant.

Files:

• commands.c (modified) (1 diff)
• editwin.c (modified) (3 diffs)
• functions.c (modified) (5 diffs)
• global.c (modified) (1 diff)

commands.c

@@ -2566 +2566 @@
   /* if we get two arguments, ask for the password */
   if (argc==2) {
-    owl_global_set_buffercommand(&g, argv[1]);
-    owl_global_set_buffercallback(&g, &owl_callback_aimlogin);
+    owl_editwin_set_cbdata(owl_global_get_typwin(&g),
+                           owl_strdup(argv[1]), owl_free);
+    owl_editwin_set_callback(owl_global_get_typwin(&g),
+                             owl_callback_aimlogin);
     owl_function_start_password("AIM Password: ");
     return(NULL);

editwin.c

@@ -35 +35 @@
   oe_excursion *excursions;
 
-  char *command;
   void (*callback)(struct _owl_editwin*);
   void (*destroy_cbdata)(void *);
@@ -77 +76 @@
   owl_free(e->buff);
   owl_free(e->killbuf);
-  owl_free(e->command);
   /* just in case someone forgot to clean up */
   while (e->excursions) {
@@ -181 +179 @@
 {
   e->dotsend=1;
-}
-
-void owl_editwin_set_command(owl_editwin *e, const char *command)
-{
-  if(e->command) owl_free(e->command);
-  e->command = owl_strdup(command);
-}
-
-const char *owl_editwin_get_command(owl_editwin *e)
-{
-  if(e->command) return e->command;
-  return "";
 }
 

functions.c

@@ -296 +296 @@
 
   owl_editwin_set_cbdata(owl_global_get_typwin(&g), data, cleanup);
-  owl_global_set_buffercallback(&g, callback);
+  owl_editwin_set_callback(owl_global_get_typwin(&g), callback);
   owl_global_push_context(&g, OWL_CTX_EDITMULTI, e, "editmulti");
 }
@@ -312 +312 @@
                          noun);
 
-  owl_function_start_edit_win(line, callback, NULL, NULL);
-  owl_global_set_buffercommand(&g, line);
+  owl_function_start_edit_win(line, callback,
+                              owl_strdup(line),
+                              owl_free);
 }
 
@@ -349 +350 @@
 
 void owl_callback_zwrite(owl_editwin *e) {
-  owl_function_zwrite(owl_editwin_get_command(e),
+  char *command = owl_editwin_get_cbdata(e);
+  owl_function_zwrite(command,
                       owl_editwin_get_text(e));
 }
@@ -447 +449 @@
 
 void owl_callback_aimwrite(owl_editwin *e) {
-  owl_function_aimwrite(owl_editwin_get_command(e),
+  char *command = owl_editwin_get_cbdata(e);
+  owl_function_aimwrite(command,
                         owl_editwin_get_text(e));
 }
@@ -882 +885 @@
 
 void owl_callback_aimlogin(owl_editwin *e) {
-  owl_function_aimlogin(owl_editwin_get_command(e),
+  char *user = owl_editwin_get_cbdata(e);
+  owl_function_aimlogin(user,
                         owl_editwin_get_text(e));
 }

global.c

@@ -324 +324 @@
 }
 
-/* buffercommand */
-
-void owl_global_set_buffercommand(owl_global *g, const char *command) {
-  owl_editwin_set_command(owl_global_get_typwin(g), command);
-}
-
-const char *owl_global_get_buffercommand(const owl_global *g) {
-  return owl_editwin_get_command(owl_global_get_typwin(g));
-}
-
-void owl_global_set_buffercallback(owl_global *g, void (*cb)(owl_editwin*)) {
-  owl_editwin_set_callback(owl_global_get_typwin(g), cb);
-}
-
-void (*owl_global_get_buffercallback(const owl_global *g))(owl_editwin*) {
-  return owl_editwin_get_callback(owl_global_get_typwin(g));
-}
-
 /* refresh */