Replace watch_pid, watch_fd with arrays, though for now only use the first item in the arrays (#12).

src/include/options.h

@@ -59,8 +59,6 @@ struct opts_s {
 	off_t error_skip_block;        /* skip block size, 0 for adaptive */
 	pid_t remote;                  /* PID of pv to update settings of */
 	unsigned int skip_errors;      /* skip read errors counter */
-	pid_t watch_pid;	       /* process to watch fds of */
-	int watch_fd;		       /* fd to watch */
 	unsigned int average_rate_window; /* time window in seconds for average rate calculations */
 	unsigned int width;            /* screen width */
 	unsigned int height;           /* screen height */

src/include/pv-internal.h

@@ -185,10 +185,7 @@ struct pvstate_s {
 		off_t rate_limit;                /* rate limit, in bytes per second */
 		size_t target_buffer_size;       /* buffer size (0=default) */
 		off_t size;                      /* total size of data */
-		/* TODO: replace watch_pid, watch_fd with arrays (#12) */
-		pid_t watch_pid;		 /* process to watch fds of */
 		unsigned int skip_errors;        /* skip read errors counter */
-		int watch_fd;			 /* fd to watch */
 		int output_fd;                   /* fd to write output to */
 		unsigned int average_rate_window; /* time window in seconds for average rate calculations */
 		unsigned int history_interval;	 /* seconds between each average rate calc history entry */

src/include/pv.h

@@ -233,8 +233,6 @@ extern void pv_state_name_set(pvstate_t, /*@null@*/ const char *);
 extern void pv_state_default_bar_style_set(pvstate_t, /*@null@ */ const char *);
 extern void pv_state_format_string_set(pvstate_t, /*@null@*/ const char *);
 extern void pv_state_extra_display_set(pvstate_t, /*@null@*/ const char *);
-extern void pv_state_watch_pid_set(pvstate_t, pid_t);
-extern void pv_state_watch_fd_set(pvstate_t, int);
 extern void pv_state_output_set(pvstate_t, int, const char *);
 extern void pv_state_average_rate_window_set(pvstate_t, unsigned int);
 extern void pv_state_set_terminal_supports_utf8(pvstate_t, bool);