Changeset 47e0a6a

Timestamp:

Mar 24, 2011, 4:10:53 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

283ff1e

Parents:

d07af84

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 00:17:26)

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:10:53)

Message:

Punt a number of g_new NULL checks, various minor cleanups

No real need to check g_new's return value as it always succeeds. (Or
destroys the universe^Wprocess in embarrassment.) Also make owl_global
manage the lifetime of the kill buffer since it's part of owl_global
now. And replace a g_new/strncpy with a g_strndup. It's shorter.

Files:

• editwin.c (modified) (3 diffs)
• global.c (modified) (1 diff)
• keymap.c (modified) (1 diff)
• popexec.c (modified) (1 diff)

editwin.c

@@ -301 +301 @@
 
   if (lock > 0) {
-    locktext = g_new(char, lock+1);
-    strncpy(locktext, e->buff, lock);
-    locktext[lock] = 0;
+    locktext = g_strndup(e->buff, lock);
   }
 
@@ -1059 +1057 @@
 void owl_editwin_yank(owl_editwin *e)
 {
-  char *killbuf = owl_global_get_kill_buffer(&g);
+  const char *killbuf = owl_global_get_kill_buffer(&g);
 
   if (killbuf != NULL)
@@ -1067 +1065 @@
 static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len)
 {
-  char *p;
-  char *killbuf = owl_global_get_kill_buffer(&g);
-
-  p = g_new(char, len + 1);
-
-  if (p != NULL) {
-    g_free(killbuf);
-    memcpy(p, buf, len);
-    p[len] = 0;
-    owl_global_set_kill_buffer(&g,p);
-  }
-
-  return p;
+  owl_global_set_kill_buffer(&g, buf, len);
+  return owl_global_get_kill_buffer(&g);
 }
 

global.c

@@ -957 +957 @@
 }
 
-char *owl_global_get_kill_buffer(owl_global *g) {
+const char *owl_global_get_kill_buffer(owl_global *g) {
   return g->kill_buffer;
 }
 
-void owl_global_set_kill_buffer(owl_global *g,char *kill) {
-  g->kill_buffer = kill;
-}
+void owl_global_set_kill_buffer(owl_global *g, const char *kill, int len) {
+  g_free(g->kill_buffer);
+  g->kill_buffer = g_strndup(kill, len);
+}

keymap.c

@@ -197 +197 @@
   owl_keymap *km;
   km = g_new(owl_keymap, 1);
-  if (!km) return NULL;
   owl_keymap_init(km, name, desc, default_fn, prealways_fn, postalways_fn);
   owl_keyhandler_add_keymap(kh, km);

popexec.c

@@ -23 +23 @@
 
   pe = g_new(owl_popexec, 1);
-  if (!pe) return NULL;
   pe->winactive=0;
   pe->pid=0;