Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/ipf/tools Merge error - stale code from HEAD not removed.
details: https://anonhg.NetBSD.org/src/rev/ff654092aaea
branches: trunk
changeset: 773315:ff654092aaea
user: darrenr <darrenr%NetBSD.org@localhost>
date: Mon Jan 30 20:08:31 2012 +0000
description:
Merge error - stale code from HEAD not removed.
diffstat:
dist/ipf/tools/ipmon.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diffs (18 lines):
diff -r 61a3cee81c06 -r ff654092aaea dist/ipf/tools/ipmon.c
--- a/dist/ipf/tools/ipmon.c Mon Jan 30 20:02:55 2012 +0000
+++ b/dist/ipf/tools/ipmon.c Mon Jan 30 20:08:31 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmon.c,v 1.19 2012/01/30 16:12:05 darrenr Exp $ */
+/* $NetBSD: ipmon.c,v 1.20 2012/01/30 20:08:31 darrenr Exp $ */
/*
* Copyright (C) 2010 by Darren Reed.
@@ -1597,8 +1597,6 @@
char *prog;
config_t config;
- n = 0; /* XXX gcc */
-
prog = strrchr(argv[0], '/');
if (prog == NULL)
prog = argv[0];
Home |
Main Index |
Thread Index |
Old Index