MINOR: flt_http_comp: define and use proxy_get_comp() helper function

proxy_get_comp() function can be used to retrieve proxy->comp options or
allocate and initialize it if missing

For now, it is solely used by parse_compression_options(), but the goal is
to be able to use this helper from multiple origins.

diff --git a/src/flt_http_comp.c b/src/flt_http_comp.c
index 79dbcb84a70d401fe6ec58de769b027ec78632e1..6a744f401bfcc0f8f99d6ebd95fc8dff6d57c4d0 100644 (file)
--- a/src/flt_http_comp.c
+++ b/src/flt_http_comp.c
@@ -782,6 +782,27 @@ struct flt_ops comp_ops = {
        .http_end              = comp_http_end,
 };
 
+/* returns compression options from <proxy> proxy or allocates them if
+ * needed
+ *
+ * When compression options are created, flags will be set to <defaults>
+ *
+ * Returns NULL in case of memory error
+ */
+static inline struct comp *proxy_get_comp(struct proxy *proxy, int defaults)
+{
+       struct comp    *comp;
+
+       if (proxy->comp == NULL) {
+               comp = calloc(1, sizeof(*comp));
+               if (unlikely(!comp))
+                       return NULL;
+               comp->flags = defaults;
+               proxy->comp = comp;
+       }
+       return proxy->comp;
+}
+
 static int
 parse_compression_options(char **args, int section, struct proxy *proxy,
                          const struct proxy *defpx, const char *file, int line,
@@ -791,19 +812,13 @@ parse_compression_options(char **args, int section, struct proxy *proxy,
        int ret = 0;
        const char *res;
 
-       if (proxy->comp == NULL) {
-               comp = calloc(1, sizeof(*comp));
-               if (unlikely(!comp)) {
-                       memprintf(err, "'%s': out of memory.", args[0]);
-                       ret = -1;
-                       goto end;
-               }
-               /* Always default to compress responses */
-               comp->flags = COMP_FL_DIR_RES;
-               proxy->comp = comp;
+       /* always default to compress responses */
+       comp = proxy_get_comp(proxy, COMP_FL_DIR_RES);
+       if (comp == NULL) {
+               memprintf(err, "'%s': out of memory.", args[0]);
+               ret = -1;
+               goto end;
        }
-       else
-               comp = proxy->comp;
 
        if (strcmp(args[1], "algo") == 0 || strcmp(args[1], "algo-res") == 0) {
                struct comp_ctx *ctx;