commit d6f1a6e931beccd75b4e77c8ea99ca6699d052b4
author Matt Caswell <matt@openssl.org> Mon Oct 05 10:58:52 2015 +0100
committer Matt Caswell <matt@openssl.org> Fri Oct 30 08:39:46 2015 +0000
tree 1e8adb790baac65eb327e185a605f2b1b01980f1
parent 5998e2903589e7b19e102ebff06521f2dcb60409

Rename STATEM to OSSL_STATEM

Add an OSSL_ prefix onto STATEM

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

ssl/statem/statem.c

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index dd7a260..062329f 100644
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -228,7 +228,7 @@
     BUF_MEM *buf = NULL;
     unsigned long Time = (unsigned long)time(NULL);
     void (*cb) (const SSL *ssl, int type, int val) = NULL;
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
     int ret = -1;
     int ssret;
 
@@ -454,7 +454,7 @@
  */
 static void init_read_state_machine(SSL *s)
 {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
 
     st->read_state = READ_STATE_HEADER;
 }
@@ -486,7 +486,7 @@
  * will resume in the same state where we left off.
  */
 static enum SUB_STATE_RETURN read_state_machine(SSL *s) {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
     int ret, mt;
     unsigned long len;
     int (*transition)(SSL *s, int mt);
@@ -632,7 +632,7 @@
  */
 static int statem_do_write(SSL *s)
 {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
 
     if (st->hand_state == TLS_ST_CW_CHANGE
             || st->hand_state == TLS_ST_SW_CHANGE) {
@@ -650,7 +650,7 @@
  */
 static void init_write_state_machine(SSL *s)
 {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
 
     st->write_state = WRITE_STATE_TRANSITION;
 }
@@ -688,7 +688,7 @@
  */
 static enum SUB_STATE_RETURN write_state_machine(SSL *s)
 {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
     int ret;
     enum WRITE_TRAN (*transition)(SSL *s);
     enum WORK_STATE (*pre_work)(SSL *s, enum WORK_STATE wst);
@@ -811,7 +811,7 @@
  */
 int ossl_statem_app_data_allowed(SSL *s)
 {
-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;
 
     if (st->state == MSG_FLOW_UNINITED || st->state == MSG_FLOW_RENEGOTIATE)
         return 0;