From e34817d8072466a4d124821c76f2b13a13a33f6d Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Fri, 21 May 1999 22:09:19 +0000
Subject: [PATCH] Take advantage of new dynamic string macros.

---
 xcatch.c   | 9 ++++++---
 xgetline.c | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/xcatch.c b/xcatch.c
index 9a6c636..fd0e0d6 100644
--- a/xcatch.c
+++ b/xcatch.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xcatch.c,v 1.6 1999/05/19 20:41:15 mdw Exp $
+ * $Id: xcatch.c,v 1.7 1999/05/21 22:09:19 mdw Exp $
  *
  * Catch input and trap it in an X window
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: xcatch.c,v $
+ * Revision 1.7  1999/05/21 22:09:19  mdw
+ * Take advantage of new dynamic string macros.
+ *
  * Revision 1.6  1999/05/19 20:41:15  mdw
  * Track gratuitous change in mdwopt interface.
  *
@@ -355,7 +358,7 @@ int main(int argc, char *argv[])
       if (kid < 0)
 	die(1, "couldn't fork: %s", strerror(errno));
       if (kid == 0) {
-	dstr d;
+	dstr d = DSTR_INIT;
 
 	close(pfd[0]);
 	if (pfd[1] != STDOUT_FILENO)
@@ -366,10 +369,10 @@ int main(int argc, char *argv[])
 	  close(pfd[1]);
 	execvp(argv[optind], argv + optind);
 
-	dstr_create(&d);
 	dstr_putf(&d, "%s: couldn't run `%s': %s\n",
 		  QUIS, argv[optind], strerror(errno));
 	write(STDERR_FILENO, d.buf, d.len);
+	dstr_destroy(&d);
 	_exit(127);
       }
 
diff --git a/xgetline.c b/xgetline.c
index 8f8a8dc..322f7aa 100644
--- a/xgetline.c
+++ b/xgetline.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xgetline.c,v 1.9 1999/05/05 18:54:37 mdw Exp $
+ * $Id: xgetline.c,v 1.10 1999/05/21 22:09:19 mdw Exp $
  *
  * Fetch a line of text from the user
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: xgetline.c,v $
+ * Revision 1.10  1999/05/21 22:09:19  mdw
+ * Take advantage of new dynamic string macros.
+ *
  * Revision 1.9  1999/05/05 18:54:37  mdw
  * Keep blank lines out of the history list.
  *
@@ -347,9 +350,8 @@ int main(int argc, char *argv[])
 
     hist = 0;
     if (fp) {
-      dstr d;
+      dstr d = DSTR_INIT;
 
-      dstr_create(&d);
       while (dstr_putline(&d, fp) != EOF) {
 	hist = g_list_append(hist, xstrdup(d.buf));
 	dstr_destroy(&d);
-- 
2.11.0