fixed spaces

kaltura · Feb 26, 2024 · 60029b6 · 60029b6
1 parent 47c1886
commit 60029b6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/nginx-live-module/src/persist/ngx_live_persist.c b/nginx-live-module/src/persist/ngx_live_persist.c
@@ -262,12 +262,10 @@ ngx_live_persist_write_file(ngx_live_channel_t *channel,
                 "ngx_live_persist_write_file: complex value failed");
             goto failed;
         }
-    }
-    else {
+    } else {
         ngx_str_set(&request.tag_value, "");
     }
 
-
     write_ctx = ngx_persist_write_init(pool, type->type,
         type->compress ? ppcf->comp_level : 0);
     if (write_ctx == NULL) {

diff --git a/nginx-live-module/src/persist/ngx_live_persist_core.c b/nginx-live-module/src/persist/ngx_live_persist_core.c
@@ -533,10 +533,8 @@ ngx_live_persist_core_merge_preset_conf(ngx_conf_t *cf, void *parent,
         } else if (conf->files[i].path == NULL) {
             conf->files[i].path = prev->files[i].path;
         }
-        if (ppcf->store == NULL) {
-            conf->files[i].tag_value = NULL;
 
-        } else if (conf->files[i].tag_value == NULL) {
+        if (conf->files[i].tag_value == NULL) {
             conf->files[i].tag_value = prev->files[i].tag_value;
         }
 

diff --git a/nginx-live-module/src/persist/ngx_live_store.h b/nginx-live-module/src/persist/ngx_live_store.h
@@ -64,7 +64,6 @@ typedef struct {
     ngx_chain_t                      *cl;
     size_t                            size;
     ngx_str_t                         tag_value;
-
     ngx_live_store_write_handler_pt   handler;
     void                             *data;
 } ngx_live_store_write_request_t;

diff --git a/nginx-live-module/src/persist/ngx_live_store_s3.c b/nginx-live-module/src/persist/ngx_live_store_s3.c
@@ -922,7 +922,6 @@ ngx_live_store_s3_put_request(ngx_pool_t *pool, void *arg, ngx_str_t *host,
         return NGX_ERROR;
     }
 
-
     *result = b;
 
     return NGX_OK;
-Original file line number
+Diff line change
@@ Expand Up @@
             return NGX_ERROR;
         }
         *result = b;
         return NGX_OK;
@@ Expand Down @@