Merge pull request #155 from adamjrichter/devel

michalvasko · web-flow · commit 6ba5d9332df6 · 2019-06-20T10:05:05.000+02:00
Eliminte two trivial redundancies, which the compiler already optimizes out
diff --git a/src/messages_server.c b/src/messages_server.c
@@ -630,8 +630,6 @@ nc_err_set_msg(struct nc_server_error *err, const char *error_message, const cha
     }
     if (lang) {
         err->message_lang = lydict_insert(server_opts.ctx, lang, 0);
-    } else {
-        lang = NULL;
     }
 
     return 0;
diff --git a/src/session_server_tls.c b/src/session_server_tls.c
@@ -1625,7 +1625,7 @@ nc_server_tls_get_ctn(uint32_t *id, char **fingerprint, NC_TLS_CTN_MAPTYPE *map_
         if (map_type && !(*map_type) && ctn->map_type) {
             *map_type = ctn->map_type;
         }
-        if (name && !(*name) && ctn->name && ctn->name) {
+        if (name && !(*name) && ctn->name) {
             *name = strdup(ctn->name);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -630,8 +630,6 @@ nc_err_set_msg(struct nc_server_error err, const char error_message, const cha`
`630`	`630`	`}`
`631`	`631`	`if (lang) {`
`632`	`632`	`err->message_lang = lydict_insert(server_opts.ctx, lang, 0);`
`633`		`- } else {`
`634`		`- lang = NULL;`
`635`	`633`	`}`
`636`	`634`
`637`	`635`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1625,7 +1625,7 @@ nc_server_tls_get_ctn(uint32_t id, char fingerprint, NC_TLS_CTN_MAPTYPE map_`
`1625`	`1625`	`if (map_type && !(*map_type) && ctn->map_type) {`
`1626`	`1626`	`*map_type = ctn->map_type;`
`1627`	`1627`	`}`
`1628`		`- if (name && !(*name) && ctn->name && ctn->name) {`
	`1628`	`+ if (name && !(*name) && ctn->name) {`
`1629`	`1629`	`*name = strdup(ctn->name);`
`1630`	`1630`	`}`
`1631`	`1631`