[PATCH] Small cleanups to DFA

[Paolo Bonzini]

I am pushing these two trivial patches.

Paolo Bonzini (2):
  dfa: use copyset to copy charclasses
  dfa: use memcpy to copy position_sets

 src/dfa.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

-- 
1.7.5.2

>From 15eaeefe3a140ef496ebd7d3234041bcba0c462f Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <address@hidden>
Date: Tue, 28 Jun 2011 09:45:06 +0200
Subject: [PATCH 1/2] dfa: use copyset to copy charclasses

* src/dfa.c (add_utf8_anychar): Change memcpy to copyset.
---
 src/dfa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index f2cd198..0bb810d 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1555,7 +1555,7 @@ add_utf8_anychar (void)
     for (i = 0; i < n; i++)
       {
         charclass c;
-        memcpy (c, utf8_classes[i], sizeof c);
+        copyset (utf8_classes[i], c);
         if (i == 1)
           {
             if (!(syntax_bits & RE_DOT_NEWLINE))
-- 
1.7.5.2


>From ee9c7844147c001004f4b87171c26238d24f8194 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <address@hidden>
Date: Tue, 28 Jun 2011 09:44:02 +0200
Subject: [PATCH 2/2] dfa: use memcpy to copy position_sets

* src/dfa.c (copy): Use memcpy.
---
 src/dfa.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/dfa.c b/src/dfa.c
index 0bb810d..a36b80a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -1831,10 +1831,7 @@ dfaparse (char const *s, size_t len, struct dfa *d)
 static void
 copy (position_set const *src, position_set *dst)
 {
-  int i;
-
-  for (i = 0; i < src->nelem; ++i)
-    dst->elems[i] = src->elems[i];
+  memcpy(dst->elems, src->elems, sizeof(dst->elems[0]) * src->nelem);
   dst->nelem = src->nelem;
 }
 
-- 
1.7.5.2