CLEANUP: obj_type: rename OBJ_TYPE_CS to OBJ_TYPE_SC

Let's apply the new name to the type as well.

diff --git a/include/haproxy/obj_type-t.h b/include/haproxy/obj_type-t.h
index 4f5b75b08112815003a4e68512070f2c6762c6de..517d2303d393f5649c23a028a45e2aab6872ee62 100644 (file)
--- a/include/haproxy/obj_type-t.h
+++ b/include/haproxy/obj_type-t.h
@@ -40,7 +40,7 @@ enum obj_type {
        OBJ_TYPE_APPCTX,       /* object is a struct appctx */
        OBJ_TYPE_CONN,         /* object is a struct connection */
        OBJ_TYPE_SRVRQ,        /* object is a struct dns_srvrq */
-       OBJ_TYPE_CS,           /* object is a struct stconn */
+       OBJ_TYPE_SC,           /* object is a struct stconn */
        OBJ_TYPE_STREAM,       /* object is a struct stream */
        OBJ_TYPE_CHECK,        /* object is a struct check */
        OBJ_TYPE_ENTRIES       /* last one : number of entries */

diff --git a/include/haproxy/obj_type.h b/include/haproxy/obj_type.h
index d60282d3fb1f0445c55312975aee624dd8098f5b..1037460888a9ab6b4414adfc1a0ca4ab681780fc 100644 (file)
--- a/include/haproxy/obj_type.h
+++ b/include/haproxy/obj_type.h
@@ -51,7 +51,7 @@ static inline const char *obj_type_name(const enum obj_type *t)
        case OBJ_TYPE_APPCTX:   return "APPCTX";
        case OBJ_TYPE_CONN:     return "CONN";
        case OBJ_TYPE_SRVRQ:    return "SRVRQ";
-       case OBJ_TYPE_CS:       return "CS";
+       case OBJ_TYPE_SC:       return "SC";
        case OBJ_TYPE_STREAM:   return "STREAM";
        case OBJ_TYPE_CHECK:    return "CHECK";
        default:                return "!INVAL!";
@@ -125,16 +125,16 @@ static inline struct appctx *objt_appctx(enum obj_type *t)
        return __objt_appctx(t);
 }
 
-static inline struct stconn *__objt_cs(enum obj_type *t)
+static inline struct stconn *__objt_sc(enum obj_type *t)
 {
        return (container_of(t, struct stconn, obj_type));
 }
 
-static inline struct stconn *objt_cs(enum obj_type *t)
+static inline struct stconn *objt_sc(enum obj_type *t)
 {
-       if (!t || *t != OBJ_TYPE_CS)
+       if (!t || *t != OBJ_TYPE_SC)
                return NULL;
-       return __objt_cs(t);
+       return __objt_sc(t);
 }
 
 static inline struct connection *__objt_conn(enum obj_type *t)
@@ -196,7 +196,7 @@ static inline void *obj_base_ptr(enum obj_type *t)
        case OBJ_TYPE_APPCTX:   return __objt_appctx(t);
        case OBJ_TYPE_CONN:     return __objt_conn(t);
        case OBJ_TYPE_SRVRQ:    return __objt_resolv_srvrq(t);
-       case OBJ_TYPE_CS:       return __objt_cs(t);
+       case OBJ_TYPE_SC:       return __objt_sc(t);
        case OBJ_TYPE_STREAM:   return __objt_stream(t);
        case OBJ_TYPE_CHECK:    return __objt_check(t);
        default:                return t; // exact pointer for invalid case

diff --git a/src/stconn.c b/src/stconn.c
index e0f0d2e1ebe0ea49d82d4d610e1fe12ad58dc63d..908908f3664a9fd33d2acbd41fa653a0940ba620 100644 (file)
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -130,7 +130,7 @@ static struct stconn *sc_new(struct sedesc *sedesc)
        if (unlikely(!sc))
                goto alloc_error;
 
-       sc->obj_type = OBJ_TYPE_CS;
+       sc->obj_type = OBJ_TYPE_SC;
        sc->flags = SC_FL_NONE;
        sc->state = SC_ST_INI;
        sc->hcto = TICK_ETERNITY;