diff options
| author | hm <hm@FreeBSD.org> | 1999-05-11 08:22:15 +0000 |
|---|---|---|
| committer | hm <hm@FreeBSD.org> | 1999-05-11 08:22:15 +0000 |
| commit | cdc189e43d7717a9caeeec4fa84cf41f857f1663 (patch) | |
| tree | 24dc1545b1caa0ae6324387164502a7db1a98638 /usr.sbin/i4b/isdnmonitor | |
| parent | 8f4ecc2360c3d7c61b5cfe7e03db9a3c1d16c5d1 (diff) | |
| download | FreeBSD-src-cdc189e43d7717a9caeeec4fa84cf41f857f1663.zip FreeBSD-src-cdc189e43d7717a9caeeec4fa84cf41f857f1663.tar.gz | |
fix name clash for variables named "minor" and "major"
Submitted by: Steve Kargl
Diffstat (limited to 'usr.sbin/i4b/isdnmonitor')
| -rw-r--r-- | usr.sbin/i4b/isdnmonitor/main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/i4b/isdnmonitor/main.c b/usr.sbin/i4b/isdnmonitor/main.c index d1903de..0ecdb69 100644 --- a/usr.sbin/i4b/isdnmonitor/main.c +++ b/usr.sbin/i4b/isdnmonitor/main.c @@ -33,7 +33,7 @@ * i4b daemon - network monitor client * ----------------------------------- * - * $Id: main.c,v 1.10 1999/02/14 09:44:57 hm Exp $ + * $Id: main.c,v 1.2 1999/03/07 16:12:43 hm Exp $ * * last edit-date: [Tue Oct 27 11:53:12 1998] * @@ -100,8 +100,8 @@ static int state = 0; static int sub_state = 0; static int sub_state_count = 0; -static int major = 0; -static int minor = 0; +static int isdn_major = 0; +static int isdn_minor = 0; static int nctrl = 0; static u_int32_t rights = 0; @@ -450,13 +450,13 @@ static void handle_event(BYTE *msg, int len) { case 0: /* initial data */ - major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR); - minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR); + isdn_major = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMAJOR); + isdn_minor = I4B_GET_2B(msg, I4B_MON_IDATA_VERSMINOR); nctrl = I4B_GET_2B(msg, I4B_MON_IDATA_NUMCTRL); rights = I4B_GET_4B(msg, I4B_MON_IDATA_CLACCESS); printf("remote protocol version is %02d.%02d, %d controller(s) found, our rights = %x\n", - major, minor, nctrl, rights); + isdn_major, isdn_minor, nctrl, rights); if (nctrl > 0) { |
