Vboot Reference: Refactor Code.

src/platform/vboot_reference/common/utility_stub.c

Index: src/platform/vboot_reference/common/utility_stub.c
diff --git a/src/platform/vboot_reference/common/utility_stub.c b/src/platform/vboot_reference/common/utility_stub.c
index 101211296d8c11e2246c4c441b7cbb976d75792d..8d21897747ea026cbd5daaea9f7b45befdd40466 100644
--- a/src/platform/vboot_reference/common/utility_stub.c
+++ b/src/platform/vboot_reference/common/utility_stub.c
@@ -48,14 +48,23 @@ int SafeMemcmp(const void* s1, const void* s2, size_t n) {
 }
 
 void* StatefulMemcpy(MemcpyState* state, void* dst, int len) {
-  void* saved_ptr;
   if (len > state->remaining_len) {
     state->remaining_len = -1;
     return NULL;
   }
-  saved_ptr = state->remaining_buf;
-  Memcpy(dst, saved_ptr, len);
+  Memcpy(dst, state->remaining_buf, len);
   state->remaining_buf += len;
   state->remaining_len -= len;
   return dst;
 }
+
+const void* StatefulMemcpy_r(MemcpyState* state, const void* src, int len) {
+  if (len > state->remaining_len) {
+    state->remaining_len = -1;
+    return NULL;
+  }
+  Memcpy(state->remaining_buf, src, len);
+  state->remaining_buf += len;
+  state->remaining_len -= len;
+  return src;
+}