X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=cprogs%2Fwatershed.c;h=f8fbc898727eca2ff5eb00b406444173b9e397c7;hp=580d2204515a7c367b8cbe385f8420f7b2efe4e8;hb=b075ddbfbdbf7d15d9f0c43d7316533cf9ed6229;hpb=c71f24621fe282a25de1b7c37d11f94ea9dd8ee0

diff --git a/cprogs/watershed.c b/cprogs/watershed.c
index 580d220..f8fbc89 100644
--- a/cprogs/watershed.c
+++ b/cprogs/watershed.c
@@ -246,7 +246,7 @@
 /*
  */
 
-#define _GNU_SOURCE
+#include "common.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -267,6 +267,9 @@
 
 #include <nettle/sha.h>
 
+#define die  common_die
+#define diee common_diee
+
 static const struct option os[]= {
   { "--state-dir", 1,0,'d' },
   { "--command-id",1,0,'i' },
@@ -308,11 +311,11 @@ static void badusage(void) {
   printusage(stderr);
   exit(127);
 }
-static void die(const char *m) {
+void die(const char *m) {
   fprintf(stderr,_("watershed: error: %s\n"), m);
   exit(127);
 }
-static void diee(const char *m) {
+void diee(const char *m) {
   fprintf(stderr,_("watershed: error: %s failed: %s\n"), m, strerror(errno));
   exit(127);
 }
@@ -322,18 +325,6 @@ static void dieep(const char *action, const char *path) {
   exit(127);
 }
 
-static char *m_vasprintf(const char *fmt, va_list al) {
-  char *s;  int r;
-  r= vasprintf(&s,fmt,al);
-  if (r==-1) diee("vasprintf");
-  return s;
-}
-static char *m_asprintf(const char *fmt, ...) {
-  char *s;  va_list al;
-  va_start(al,fmt); s= m_vasprintf(fmt,al); va_end(al);
-  return s;
-}
-
 static void parse_args(int argc, char *const *argv) {
   int o;
   for (;;) {