[Guessnet-devel] [svn] r164 - in trunk: . src

[Enrico Zini]

Author: enrico
Date: Sat Sep 23 11:41:54 2006
New Revision: 164

Removed:
   trunk/src/Regexp.cc
   trunk/src/Regexp.h
Modified:
   trunk/   (props changed)
   trunk/src/GuessnetEnvironment.cc
   trunk/src/GuessnetParser.cc
   trunk/src/IfaceParser.cc
   trunk/src/Makefile.am
Log:
 r427 at viaza:  enrico | 2006-09-23 12:18:52 +0100
 Ported to the Regexp in wibble


Modified: trunk/src/GuessnetEnvironment.cc
==============================================================================
--- trunk/src/GuessnetEnvironment.cc	(original)
+++ trunk/src/GuessnetEnvironment.cc	Sat Sep 23 11:41:54 2006
@@ -28,11 +28,11 @@
 #endif
 
 #include "GuessnetEnvironment.h"
-#include "Regexp.h"
 
 #include "GuessnetParser.h"
 #include "IfaceParser.h"
 
+#include <wibble/regexp.h>
 #include <wibble/commandline/parser.h>
 #include <set>
 
@@ -206,9 +206,8 @@
 		::debug("program name is guessnet-ifupdown: enabling ifupdown mode\n");
 
 		// Read stuff from stdin
-		ExtendedRegexp null_line("^[[:blank:]]*(#.*)?$");
-		ExtendedRegexp parm_line(
-				"^[[:blank:]]*([A-Za-z_-]+):[[:blank:]]*(.+)$", 3);
+		wibble::ERegexp null_line("^[[:blank:]]*(#.*)?$");
+		wibble::ERegexp parm_line("^[[:blank:]]*([A-Za-z_-]+):[[:blank:]]*(.+)$", 3);
 
 		string line;
 		int linenum = 1;

Modified: trunk/src/GuessnetParser.cc
==============================================================================
--- trunk/src/GuessnetParser.cc	(original)
+++ trunk/src/GuessnetParser.cc	Sat Sep 23 11:41:54 2006
@@ -28,7 +28,7 @@
 #endif
 
 #include "GuessnetParser.h"
-#include "Regexp.h"
+#include <wibble/regexp.h>
 #include "Environment.h"
 
 #include <string>
@@ -43,8 +43,8 @@
 {
 #define MACPATTERN "[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}"
 #define IPPATTERN "[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+"
-	ExtendedRegexp null_line("^[[:blank:]]*(#.*)?$");
-	ExtendedRegexp peer_line(
+	wibble::ERegexp null_line("^[[:blank:]]*(#.*)?$");
+	wibble::ERegexp peer_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"peer[[:blank:]]+"
@@ -52,35 +52,35 @@
 		"([[:blank:]]+(" MACPATTERN "))?"
 		"([[:blank:]]+(" IPPATTERN "))?"
 		"[[:blank:]]*$", 7);
-	ExtendedRegexp cable_line(
+	wibble::ERegexp cable_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"missing-cable[[:blank:]]*$", 2);
-	ExtendedRegexp script_line(
+	wibble::ERegexp script_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"(script|command)[[:blank:]]+(.+)$", 3);
-	ExtendedRegexp dhcp_line(
+	wibble::ERegexp dhcp_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"dhcp[[:blank:]]*$", 2);
-	ExtendedRegexp pppoe_line(
+	wibble::ERegexp pppoe_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"pppoe[[:blank:]]*$", 2);
-	ExtendedRegexp wireless_mac_essid_line(
+	wibble::ERegexp wireless_mac_essid_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"wireless[[:blank:]]+mac[[:blank:]]+([^[:blank:]]+)[[:blank:]]+essid[[:blank:]](.+)$", 4);
-	ExtendedRegexp wireless_mac_line(
+	wibble::ERegexp wireless_mac_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"wireless[[:blank:]]+mac[[:blank:]]+([^[:blank:]]+)[[:blank:]]*$", 3);
-	ExtendedRegexp wireless_essid_line(
+	wibble::ERegexp wireless_essid_line(
 		"^[[:blank:]]*"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"wireless[[:blank:]]+essid[[:blank:]](.+)$", 3);
-	ExtendedRegexp old_input_line(
+	wibble::ERegexp old_input_line(
 		"^[[:blank:]]*(" IPPATTERN ")[[:blank:]]+"
 		"(" MACPATTERN ")"
 		"[[:blank:]]+(" IPPATTERN ")[[:blank:]]+([[:alnum:]_+-]+)"

Modified: trunk/src/IfaceParser.cc
==============================================================================
--- trunk/src/IfaceParser.cc	(original)
+++ trunk/src/IfaceParser.cc	Sat Sep 23 11:41:54 2006
@@ -28,7 +28,7 @@
 #endif
 
 #include "IfaceParser.h"
-#include "Regexp.h"
+#include <wibble/regexp.h>
 #include "Environment.h"
 
 #include <map>
@@ -69,33 +69,33 @@
 {
 #define ATLINESTART "^[[:blank:]]*(guessnet[0-9]*[[:blank:]]+)?test[0-9]*(-|[[:blank:]]+)"
 #define MACPATTERN "[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}:[0-9A-Fa-f]{2}"
-	ExtendedRegexp null_line("^[[:blank:]]*(#.*)?$");
-	ExtendedRegexp iface_line(
+	wibble::ERegexp null_line("^[[:blank:]]*(#.*)?$");
+	wibble::ERegexp iface_line(
 		"^[[:blank:]]*iface[[:blank:]]+"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"([^[:blank:]]+)[[:blank:]]+"
 		"([^[:blank:]]+)[[:blank:]]*$", 4);
-	ExtendedRegexp peer_line(
+	wibble::ERegexp peer_line(
 		ATLINESTART "peer[[:blank:]]+(.+)$", 4);
-	ExtendedRegexp cable_line(
+	wibble::ERegexp cable_line(
 		ATLINESTART "missing-cable[[:blank:]]*([[:blank:]]+.+)?$");
-	ExtendedRegexp script_line(
+	wibble::ERegexp script_line(
 		ATLINESTART "(script|command)[[:blank:]]+(.+)$", 5);
-	ExtendedRegexp dhcp_line(
+	wibble::ERegexp dhcp_line(
 		ATLINESTART "dhcp[[:blank:]]*([[:blank:]]+.+)?$");
-	ExtendedRegexp pppoe_line(
+	wibble::ERegexp pppoe_line(
 		ATLINESTART "pppoe[[:blank:]]*([[:blank:]]+.+)?$");
-	ExtendedRegexp wireless_mac_essid_line(
+	wibble::ERegexp wireless_mac_essid_line(
 		ATLINESTART "wireless[[:blank:]]+mac[[:blank:]]+([^[:blank:]]+)[[:blank:]]+essid[[:blank:]](.+)$", 5);
-	ExtendedRegexp wireless_mac_line(
+	wibble::ERegexp wireless_mac_line(
 		ATLINESTART "wireless[[:blank:]]+mac[[:blank:]]+([^[:blank:]]+)[[:blank:]]*$", 4);
-	ExtendedRegexp wireless_essid_line(
+	wibble::ERegexp wireless_essid_line(
 		ATLINESTART "wireless[[:blank:]]+essid[[:blank:]](.+)$", 4);
-	ExtendedRegexp old_default_line(
+	wibble::ERegexp old_default_line(
 		"^[[:blank:]]*guessnet[[:blank:]]+"
 		"default[[:blank:]]*$");
-	ExtendedRegexp generic_guessnet_line(ATLINESTART);
-	ExtendedRegexp parm_line(
+	wibble::ERegexp generic_guessnet_line(ATLINESTART);
+	wibble::ERegexp parm_line(
 		"^[[:blank:]]*([^[:blank:]]+)[[:blank:]]+(.+)$", 2);
 	string profileName;
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Sep 23 11:41:54 2006
@@ -12,7 +12,6 @@
 	Thread.cc \
 	Exec.cc \
 	ChildProcess.cc \
-	Regexp.cc \
 	Parser.cc \
 	Scans.cc \
 	ScanBag.cc \
@@ -72,7 +71,6 @@
 	Parser.h \
 	PeerScanner.h \
 	ProcessRunner.h \
-	Regexp.h \
 	ScanBag.h \
 	ScanConsumer.h \
 	Scanner.h \