From: Ted Lemon <source@isc.org>
Date: Tue, 6 Jul 1999 17:04:31 +0000 (+0000)
Subject: Fix some pastos in new expression evaluators.
X-Git-Tag: V3-BETA-1-PATCH-0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=644b841676d0bdba612d9e7d74d6eeacf6a70e83;p=thirdparty%2Fdhcp.git

Fix some pastos in new expression evaluators.
---

diff --git a/common/tree.c b/common/tree.c
index 618ea8030..437a83645 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.30 1999/07/02 20:57:26 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.31 1999/07/06 17:04:31 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -904,9 +904,9 @@ int evaluate_data_expression (result, packet, options, lease, expr)
 		/* Evaluate the base (offset) and width (len): */
 		s0 = evaluate_numeric_expression
 			(&offset, packet, options, lease,
-			 expr -> data.substring.offset);
+			 expr -> data.b2a.base);
 		s1 = evaluate_numeric_expression (&len, packet, options, lease,
-						  expr -> data.substring.len);
+						  expr -> data.b2a.width);
 
 		/* Evaluate the seperator string. */
 		memset (&data, 0, sizeof data);
@@ -915,7 +915,7 @@ int evaluate_data_expression (result, packet, options, lease, expr)
 
 		/* Evaluate the data to be converted. */
 		memset (&other, 0, sizeof other);
-		s3 = evaluate_data_expression (&data, packet, options, lease,
+		s3 = evaluate_data_expression (&other, packet, options, lease,
 					       expr -> data.b2a.buffer);
 
 		if (s0 && s1 && s2 && s3) {
@@ -1022,18 +1022,12 @@ int evaluate_data_expression (result, packet, options, lease, expr)
 		/* Evaluate the width (len): */
 		s0 = evaluate_numeric_expression
 			(&len, packet, options, lease,
-			 expr -> data.substring.offset);
+			 expr -> data.reverse.width);
 
 		/* Evaluate the data. */
 		memset (&data, 0, sizeof data);
 		s1 = evaluate_data_expression (&data, packet, options, lease,
-					       expr -> data.b2a.seperator);
-
-		if (len != 8 && len != 16 && len != 32) {
-			log_info ("reverse: invalid width %d!", len);
-			goto b2a_out;
-		}
-		len /= 8;
+					       expr -> data.reverse.buffer);
 
 		if (s0 && s1) {
 			char *upper;