From 69eaf98913d76e422a61b913e35dcdc6f69d6272 Mon Sep 17 00:00:00 2001 From: Olof hagsand Date: Thu, 5 Dec 2024 17:35:05 +0100 Subject: [PATCH] Remove extra lines --- apps/backend/backend_socket.h | 1 - apps/backend/backend_startup.c | 1 - apps/backend/backend_startup.h | 1 - apps/backend/clixon_backend.h | 1 - apps/backend/clixon_backend_commit.h | 1 - apps/backend/clixon_backend_handle.c | 1 - apps/backend/clixon_backend_transaction.h | 1 - apps/cli/cli_autocli.c | 1 - apps/cli/cli_common.c | 1 - apps/cli/cli_plugin.c | 1 - apps/cli/cli_plugin.h | 1 - apps/cli/clixon_cli.h | 1 - apps/netconf/clixon_netconf.h | 1 - apps/netconf/netconf_filter.c | 1 - apps/restconf/clixon_http1_parse.y | 2 -- apps/restconf/clixon_http_data.c | 1 - apps/restconf/clixon_restconf.h | 1 - apps/restconf/restconf_api_fcgi.c | 1 - apps/restconf/restconf_api_native.c | 1 - apps/restconf/restconf_err.c | 4 +--- apps/restconf/restconf_err.h | 1 - apps/restconf/restconf_lib.c | 1 - apps/restconf/restconf_main_native.c | 1 - apps/restconf/restconf_methods.c | 1 - apps/restconf/restconf_methods_get.c | 1 - apps/restconf/restconf_methods_patch.c | 1 - apps/restconf/restconf_methods_patch.h | 1 - apps/restconf/restconf_methods_post.c | 1 - apps/restconf/restconf_native.c | 1 - apps/restconf/restconf_native.h | 2 -- apps/restconf/restconf_root.c | 2 -- apps/snmp/snmp_handler.c | 2 -- apps/snmp/snmp_handler.h | 1 - apps/snmp/snmp_lib.c | 3 --- apps/snmp/snmp_lib.h | 1 - apps/snmp/snmp_register.h | 1 - lib/clixon/clixon.h.in | 1 - lib/clixon/clixon_handle.h | 1 - lib/clixon/clixon_log.h | 2 -- lib/clixon/clixon_text_syntax.h | 1 - lib/clixon/clixon_xpath_optimize.h | 1 - lib/clixon/clixon_yang_type.h | 1 - lib/src/clixon_api_path_parse.l | 1 - lib/src/clixon_api_path_parse.y | 2 -- lib/src/clixon_hash.c | 1 - lib/src/clixon_instance_id_parse.l | 1 - lib/src/clixon_instance_id_parse.y | 2 -- lib/src/clixon_json.c | 2 -- lib/src/clixon_json_parse.l | 2 -- lib/src/clixon_json_parse.y | 1 - lib/src/clixon_nacm.c | 1 - lib/src/clixon_plugin.c | 1 - lib/src/clixon_regex.c | 2 -- lib/src/clixon_stream.c | 1 - lib/src/clixon_string.c | 1 - lib/src/clixon_text_syntax_parse.y | 1 - lib/src/clixon_validate.c | 1 - lib/src/clixon_xml.c | 1 - lib/src/clixon_xml_parse.y | 2 -- lib/src/clixon_xml_vec.c | 1 - lib/src/clixon_xpath.c | 1 - lib/src/clixon_xpath_ctx.c | 1 - lib/src/clixon_xpath_eval.c | 2 -- lib/src/clixon_xpath_optimize.c | 2 -- lib/src/clixon_xpath_parse.l | 2 -- lib/src/clixon_xpath_parse.y | 2 -- lib/src/clixon_yang_parse.l | 3 --- lib/src/clixon_yang_parse.y | 6 ------ lib/src/clixon_yang_schema_mount.c | 1 - lib/src/clixon_yang_schemanode_parse.y | 1 - lib/src/clixon_yang_sub_parse.y | 1 - lib/src/clixon_yang_type.c | 1 - 72 files changed, 1 insertion(+), 98 deletions(-) diff --git a/apps/backend/backend_socket.h b/apps/backend/backend_socket.h index 91fcb4ea..10177ea5 100644 --- a/apps/backend/backend_socket.h +++ b/apps/backend/backend_socket.h @@ -35,7 +35,6 @@ */ - #ifndef _BACKEND_SOCKET_H_ #define _BACKEND_SOCKET_H_ diff --git a/apps/backend/backend_startup.c b/apps/backend/backend_startup.c index 5f0d19f2..1b861051 100644 --- a/apps/backend/backend_startup.c +++ b/apps/backend/backend_startup.c @@ -113,7 +113,6 @@ running |--------+------------> RUNNING parse validate OK / commit startup -------+--+-------+------------+ - INVALID (requires manual edit of candidate) failsafe ----------------------+ reset \ commit diff --git a/apps/backend/backend_startup.h b/apps/backend/backend_startup.h index 7023b5b9..29ca3319 100644 --- a/apps/backend/backend_startup.h +++ b/apps/backend/backend_startup.h @@ -35,7 +35,6 @@ */ - #ifndef _BACKEND_STARTUP_H_ #define _BACKEND_STARTUP_H_ diff --git a/apps/backend/clixon_backend.h b/apps/backend/clixon_backend.h index 70c2fcbb..b97bf668 100644 --- a/apps/backend/clixon_backend.h +++ b/apps/backend/clixon_backend.h @@ -60,4 +60,3 @@ extern "C" { #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/apps/backend/clixon_backend_commit.h b/apps/backend/clixon_backend_commit.h index b81c36af..c68796de 100644 --- a/apps/backend/clixon_backend_commit.h +++ b/apps/backend/clixon_backend_commit.h @@ -35,7 +35,6 @@ */ - #ifndef _CLIXON_BACKEND_COMMIT_H_ #define _CLIXON_BACKEND_COMMIT_H_ diff --git a/apps/backend/clixon_backend_handle.c b/apps/backend/clixon_backend_handle.c index 8c6373bc..03065963 100644 --- a/apps/backend/clixon_backend_handle.c +++ b/apps/backend/clixon_backend_handle.c @@ -234,4 +234,3 @@ backend_client_print(clixon_handle h, } return 0; } - diff --git a/apps/backend/clixon_backend_transaction.h b/apps/backend/clixon_backend_transaction.h index 91349c27..f124878a 100644 --- a/apps/backend/clixon_backend_transaction.h +++ b/apps/backend/clixon_backend_transaction.h @@ -65,7 +65,6 @@ int transaction_print(FILE *f, transaction_data th); int transaction_dbg(clixon_handle h, int dbglevel, transaction_data th, const char *msg); int transaction_log(clixon_handle h, transaction_data th, int level, const char *op); - /* Pagination callbacks * @see pagination_data_t internal structure */ diff --git a/apps/cli/cli_autocli.c b/apps/cli/cli_autocli.c index 7a7e479f..b489ecde 100644 --- a/apps/cli/cli_autocli.c +++ b/apps/cli/cli_autocli.c @@ -72,7 +72,6 @@ static const map_str2int list_kw_map[] = { {NULL, -1} }; - static int autocli_str2op(char *str) { diff --git a/apps/cli/cli_common.c b/apps/cli/cli_common.c index 9fb3e1c1..590a8b85 100644 --- a/apps/cli/cli_common.c +++ b/apps/cli/cli_common.c @@ -830,7 +830,6 @@ cli_start_program(clixon_handle h, size_t bufsize = 0; struct passwd pw, *pwresult = NULL; - /* Check parameters */ if (cvec_len(argv) == 0){ clixon_err(OE_PLUGIN, EINVAL, "Can not find argument"); diff --git a/apps/cli/cli_plugin.c b/apps/cli/cli_plugin.c index 1dd73225..fb6ab25b 100644 --- a/apps/cli/cli_plugin.c +++ b/apps/cli/cli_plugin.c @@ -796,4 +796,3 @@ cli_syntax_mode(clixon_handle h) return NULL; return cligen_ph_name_get(ph); } - diff --git a/apps/cli/cli_plugin.h b/apps/cli/cli_plugin.h index ae558d6b..160836dd 100644 --- a/apps/cli/cli_plugin.h +++ b/apps/cli/cli_plugin.h @@ -45,7 +45,6 @@ /* clicon generic callback pointer */ typedef void (clicon_callback_t)(clixon_handle h); - void *clixon_str2fn(char *name, void *handle, char **error); int clicon_parse(clixon_handle h, char *cmd, char **mode, cligen_result *result, int *evalres); diff --git a/apps/cli/clixon_cli.h b/apps/cli/clixon_cli.h index d813140c..db884bbd 100644 --- a/apps/cli/clixon_cli.h +++ b/apps/cli/clixon_cli.h @@ -70,4 +70,3 @@ int plugin_exit(clixon_handle h); #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/apps/netconf/clixon_netconf.h b/apps/netconf/clixon_netconf.h index 101ed60b..a422cffe 100644 --- a/apps/netconf/clixon_netconf.h +++ b/apps/netconf/clixon_netconf.h @@ -50,5 +50,4 @@ int netconf_xpath(cxobj *xsearch, cbuf *xf, cbuf *xf_err, cxobj *xt); - #endif /* _CLIXON_NETCONF_H_ */ diff --git a/apps/netconf/netconf_filter.c b/apps/netconf/netconf_filter.c index bdfd6e3f..56e942d9 100644 --- a/apps/netconf/netconf_filter.c +++ b/apps/netconf/netconf_filter.c @@ -211,4 +211,3 @@ xml_filter(cxobj *xfilter, &remove_s); return retval; } - diff --git a/apps/restconf/clixon_http1_parse.y b/apps/restconf/clixon_http1_parse.y index ec0ce6b2..173194db 100644 --- a/apps/restconf/clixon_http1_parse.y +++ b/apps/restconf/clixon_http1_parse.y @@ -368,7 +368,6 @@ field_values : field_vchars | { $$ = NULL; _PARSE_DEBUG("field-values -> "); } ; - field_vchars : field_vchars RWS VCHARS { if (($$ = clixon_string_del_join($1, " ", $3)) == NULL) YYABORT; @@ -393,4 +392,3 @@ ows : RWS ; %% - diff --git a/apps/restconf/clixon_http_data.c b/apps/restconf/clixon_http_data.c index e2602cb8..c7f58537 100644 --- a/apps/restconf/clixon_http_data.c +++ b/apps/restconf/clixon_http_data.c @@ -35,7 +35,6 @@ * Limited static http data service embedded in restconf code */ - #ifdef HAVE_CONFIG_H #include "clixon_config.h" /* generated by config & autoconf */ #endif diff --git a/apps/restconf/clixon_restconf.h b/apps/restconf/clixon_restconf.h index b71ea319..d4e1c529 100644 --- a/apps/restconf/clixon_restconf.h +++ b/apps/restconf/clixon_restconf.h @@ -82,4 +82,3 @@ int restconf_param_set(clixon_handle h, const char *param, char *val); #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/apps/restconf/restconf_api_fcgi.c b/apps/restconf/restconf_api_fcgi.c index 9b5e102c..c8069966 100644 --- a/apps/restconf/restconf_api_fcgi.c +++ b/apps/restconf/restconf_api_fcgi.c @@ -67,7 +67,6 @@ #include "restconf_lib.h" #include "restconf_api.h" /* Virtual api */ - /*! HTTP headers done, if there is a message body coming next * * @param[in] req Fastcgi request handle diff --git a/apps/restconf/restconf_api_native.c b/apps/restconf/restconf_api_native.c index 31cfbad0..1051cc24 100644 --- a/apps/restconf/restconf_api_native.c +++ b/apps/restconf/restconf_api_native.c @@ -204,4 +204,3 @@ restconf_get_indata(void *req0) done: return cb; } - diff --git a/apps/restconf/restconf_err.c b/apps/restconf/restconf_err.c index e7b9371f..cf5ec294 100644 --- a/apps/restconf/restconf_err.c +++ b/apps/restconf/restconf_err.c @@ -34,9 +34,7 @@ * * Return errors * @see RFC 7231 Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content - - - * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3 + * "api-path" is "URI-encoded path expression" definition in RFC8040 3.5.3 */ #ifdef HAVE_CONFIG_H diff --git a/apps/restconf/restconf_err.h b/apps/restconf/restconf_err.h index 0fbdb521..84780a78 100644 --- a/apps/restconf/restconf_err.h +++ b/apps/restconf/restconf_err.h @@ -51,5 +51,4 @@ int restconf_notimplemented(clixon_handle h, void *req, int pretty, restconf_med int api_return_err(clixon_handle h, void *req, cxobj *xerr, int pretty, restconf_media media, int code0); int api_return_err0(clixon_handle h, void *req, cxobj *xerr, int pretty, restconf_media media, int code0); - #endif /* _RESTCONF_ERR_H_ */ diff --git a/apps/restconf/restconf_lib.c b/apps/restconf/restconf_lib.c index 4f6d5588..a239df61 100644 --- a/apps/restconf/restconf_lib.c +++ b/apps/restconf/restconf_lib.c @@ -930,4 +930,3 @@ restconf_socket_init(const char *netns0, clixon_debug(CLIXON_DBG_RESTCONF, "retval:%d", retval); return retval; } - diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c index c22bb46d..6be6b9f8 100644 --- a/apps/restconf/restconf_main_native.c +++ b/apps/restconf/restconf_main_native.c @@ -427,7 +427,6 @@ restconf_ssl_context_configure(clixon_handle h, SSL_CTX_set_verify_depth(ctx, VERIFY_DEPTH+1); } - X509_STORE_set_flags(SSL_CTX_get_cert_store(ctx), 0); SSL_CTX_set_session_id_context(ctx, (void *)&session_id_context, sizeof(session_id_context)); diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c index 4f84ea7a..8d316cd0 100644 --- a/apps/restconf/restconf_methods.c +++ b/apps/restconf/restconf_methods.c @@ -824,4 +824,3 @@ api_data_delete(clixon_handle h, clixon_debug(CLIXON_DBG_RESTCONF, "retval:%d", retval); return retval; } - diff --git a/apps/restconf/restconf_methods_get.c b/apps/restconf/restconf_methods_get.c index 6e00d0ec..b00414de 100644 --- a/apps/restconf/restconf_methods_get.c +++ b/apps/restconf/restconf_methods_get.c @@ -795,4 +795,3 @@ api_operations_get(clixon_handle h, xml_free(xt); return retval; } - diff --git a/apps/restconf/restconf_methods_patch.c b/apps/restconf/restconf_methods_patch.c index 90ef027d..94fb28b3 100644 --- a/apps/restconf/restconf_methods_patch.c +++ b/apps/restconf/restconf_methods_patch.c @@ -36,7 +36,6 @@ * Restconf YANG PATCH implementation (RFC8072) */ - #ifdef HAVE_CONFIG_H #include "clixon_config.h" /* generated by config & autoconf */ #endif diff --git a/apps/restconf/restconf_methods_patch.h b/apps/restconf/restconf_methods_patch.h index 2e43b148..86062528 100644 --- a/apps/restconf/restconf_methods_patch.h +++ b/apps/restconf/restconf_methods_patch.h @@ -36,7 +36,6 @@ * Restconf YANG PATCH implementation (RFC8072) */ - #ifndef _RESTCONF_METHODS_PATCH_H_ #define _RESTCONF_METHODS_PATCH_H_ diff --git a/apps/restconf/restconf_methods_post.c b/apps/restconf/restconf_methods_post.c index 90737864..5f86648d 100644 --- a/apps/restconf/restconf_methods_post.c +++ b/apps/restconf/restconf_methods_post.c @@ -36,7 +36,6 @@ * From RFC 8040 Section 4.4. POST */ - #ifdef HAVE_CONFIG_H #include "clixon_config.h" /* generated by config & autoconf */ #endif diff --git a/apps/restconf/restconf_native.c b/apps/restconf/restconf_native.c index 91cb9450..ca9b658f 100644 --- a/apps/restconf/restconf_native.c +++ b/apps/restconf/restconf_native.c @@ -1870,4 +1870,3 @@ restconf_socket_extract(clixon_handle h, free(reason); return retval; } - diff --git a/apps/restconf/restconf_native.h b/apps/restconf/restconf_native.h index 1386da5c..5e3a8bf3 100644 --- a/apps/restconf/restconf_native.h +++ b/apps/restconf/restconf_native.h @@ -189,8 +189,6 @@ int restconf_callhome_timer(restconf_socket *rsock, int status); int restconf_socket_extract(clixon_handle h, cxobj *xs, cvec *nsc, restconf_socket *rsock, char **namespace, char **address, char **addrtype, uint16_t *port); - - #endif /* _RESTCONF_NATIVE_H_ */ #ifdef __cplusplus diff --git a/apps/restconf/restconf_root.c b/apps/restconf/restconf_root.c index 353bed99..285c4b62 100644 --- a/apps/restconf/restconf_root.c +++ b/apps/restconf/restconf_root.c @@ -34,7 +34,6 @@ * Generic restconf root handlers eg for /restconf /.well-known, etc */ - #ifdef HAVE_CONFIG_H #include "clixon_config.h" /* generated by config & autoconf */ #endif @@ -641,4 +640,3 @@ api_root_restconf(clixon_handle h, free(path); return retval; } - diff --git a/apps/snmp/snmp_handler.c b/apps/snmp/snmp_handler.c index 218f7997..1809a3fd 100644 --- a/apps/snmp/snmp_handler.c +++ b/apps/snmp/snmp_handler.c @@ -1149,8 +1149,6 @@ snmp_table_set(clixon_handle h, goto done; } - - /*! Use a cache for getnext tables instead of an RPC to the backend every time * * The cache works as follows: diff --git a/apps/snmp/snmp_handler.h b/apps/snmp/snmp_handler.h index 49f08e48..056edd19 100644 --- a/apps/snmp/snmp_handler.h +++ b/apps/snmp/snmp_handler.h @@ -59,4 +59,3 @@ int clixon_snmp_table_exit(clixon_handle h); #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/apps/snmp/snmp_lib.c b/apps/snmp/snmp_lib.c index ea395a65..9ddbf27f 100644 --- a/apps/snmp/snmp_lib.c +++ b/apps/snmp/snmp_lib.c @@ -112,7 +112,6 @@ static const map_str2int snmp_type_map[] = { {NULL, -1} }; - /* Map between clixon "orig" resolved type and ASN.1 types. */ static const map_str2int snmp_orig_map[] = { @@ -157,7 +156,6 @@ static const map_str2str yang_snmp_types[] = { { NULL, NULL} /* if not found */ }; - /*! A function that checks that all subtypes of the union are the same * * @param[in] ytype Yang resolved type (a union in this case) @@ -515,7 +513,6 @@ yangext_is_oid_exist(yang_stmt *yn) } } - /*! Duplicate clixon snmp handler struct * * Use signature of libnetsnmp data_clone field of netsnmp_mib_handler in agent_handler.h diff --git a/apps/snmp/snmp_lib.h b/apps/snmp/snmp_lib.h index 602d2aee..b4154f3b 100644 --- a/apps/snmp/snmp_lib.h +++ b/apps/snmp/snmp_lib.h @@ -119,4 +119,3 @@ int clixon_snmp_api_oid_find(oid *oid1, size_t oidlen); #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/apps/snmp/snmp_register.h b/apps/snmp/snmp_register.h index 1b9c9746..06318691 100644 --- a/apps/snmp/snmp_register.h +++ b/apps/snmp/snmp_register.h @@ -52,4 +52,3 @@ int clixon_snmp_traverse_mibyangs(clixon_handle h); #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/lib/clixon/clixon.h.in b/lib/clixon/clixon.h.in index 329a58cf..5bfc286a 100644 --- a/lib/clixon/clixon.h.in +++ b/lib/clixon/clixon.h.in @@ -127,4 +127,3 @@ extern const char CLIXON_VERSION[]; #ifdef __cplusplus } /* extern "C" */ #endif - diff --git a/lib/clixon/clixon_handle.h b/lib/clixon/clixon_handle.h index aa8212aa..56971563 100644 --- a/lib/clixon/clixon_handle.h +++ b/lib/clixon/clixon_handle.h @@ -35,7 +35,6 @@ */ - #ifndef _CLIXON_HANDLE_H_ #define _CLIXON_HANDLE_H_ diff --git a/lib/clixon/clixon_log.h b/lib/clixon/clixon_log.h index b450a9e1..e499605f 100644 --- a/lib/clixon/clixon_log.h +++ b/lib/clixon/clixon_log.h @@ -87,6 +87,4 @@ int clixon_logflags_set(uint16_t flags); int clixon_log_str(int level, char *msg); int clixon_log_fn(clixon_handle h, int user, int level, cxobj *x, const char *format, ...) __attribute__ ((format (printf, 5, 6))); - - #endif /* _CLIXON_LOG_H_ */ diff --git a/lib/clixon/clixon_text_syntax.h b/lib/clixon/clixon_text_syntax.h index c0e9896e..8943b140 100644 --- a/lib/clixon/clixon_text_syntax.h +++ b/lib/clixon/clixon_text_syntax.h @@ -46,4 +46,3 @@ int clixon_text_syntax_parse_string(char *str, yang_bind yb, yang_stmt *yspec, c int clixon_text_syntax_parse_file(FILE *fp, yang_bind yb, yang_stmt *yspec, cxobj **xt, cxobj **xerr); #endif /* _CLIXON_TEXT_SYNTAX_H */ - diff --git a/lib/clixon/clixon_xpath_optimize.h b/lib/clixon/clixon_xpath_optimize.h index ac495c32..8382091f 100644 --- a/lib/clixon/clixon_xpath_optimize.h +++ b/lib/clixon/clixon_xpath_optimize.h @@ -38,7 +38,6 @@ #ifndef _CLIXON_XPATH_OPTIMIZE_H #define _CLIXON_XPATH_OPTIMIZE_H - int xpath_list_optimize_stats(int *hits); int xpath_list_optimize_set(int enable); void xpath_optimize_exit(void); diff --git a/lib/clixon/clixon_yang_type.h b/lib/clixon/clixon_yang_type.h index 05d65399..889c8af7 100644 --- a/lib/clixon/clixon_yang_type.h +++ b/lib/clixon/clixon_yang_type.h @@ -73,5 +73,4 @@ int yang_type_resolve(yang_stmt *yorig, yang_stmt *ys, uint8_t *fraction); enum cv_type yang_type2cv(yang_stmt *ys); - #endif /* _CLIXON_YANG_TYPE_H_ */ diff --git a/lib/src/clixon_api_path_parse.l b/lib/src/clixon_api_path_parse.l index d9333f39..f4f880b1 100644 --- a/lib/src/clixon_api_path_parse.l +++ b/lib/src/clixon_api_path_parse.l @@ -147,4 +147,3 @@ api_path_scan_exit(clixon_api_path_yacc *ay) clixon_api_path_parselex_destroy(); /* modern */ return 0; } - diff --git a/lib/src/clixon_api_path_parse.y b/lib/src/clixon_api_path_parse.y index cf4b1790..bb8cf79a 100644 --- a/lib/src/clixon_api_path_parse.y +++ b/lib/src/clixon_api_path_parse.y @@ -73,7 +73,6 @@ %type key_values %type key_value - %lex-param {void *_ay} /* Add this argument to parse() and lex() function */ %parse-param {void *_ay} @@ -309,4 +308,3 @@ key_value : STRING { $$ = keyval_set(NULL, $1); free($1); _PARSE_DEBUG("key ; %% - diff --git a/lib/src/clixon_hash.c b/lib/src/clixon_hash.c index 2eb88fbf..e03e56ff 100644 --- a/lib/src/clixon_hash.c +++ b/lib/src/clixon_hash.c @@ -35,7 +35,6 @@ */ - /* * A simple implementation of a associative array style data store. Keys * are always strings while values can be some arbitrary data referenced diff --git a/lib/src/clixon_instance_id_parse.l b/lib/src/clixon_instance_id_parse.l index f669d692..cdccda70 100644 --- a/lib/src/clixon_instance_id_parse.l +++ b/lib/src/clixon_instance_id_parse.l @@ -153,4 +153,3 @@ instance_id_scan_exit(clixon_instance_id_yacc *iy) clixon_instance_id_parselex_destroy(); /* modern */ return 0; } - diff --git a/lib/src/clixon_instance_id_parse.y b/lib/src/clixon_instance_id_parse.y index 6ae4b5a7..38c58b1f 100644 --- a/lib/src/clixon_instance_id_parse.y +++ b/lib/src/clixon_instance_id_parse.y @@ -306,8 +306,6 @@ keyval_set(char *name, return cv; } - - %} diff --git a/lib/src/clixon_json.c b/lib/src/clixon_json.c index 7f5778e0..46690cf8 100644 --- a/lib/src/clixon_json.c +++ b/lib/src/clixon_json.c @@ -1700,5 +1700,3 @@ clixon_json_parse_file(FILE *fp, retval = 0; goto done; } - - diff --git a/lib/src/clixon_json_parse.l b/lib/src/clixon_json_parse.l index 2af66130..69a33f07 100644 --- a/lib/src/clixon_json_parse.l +++ b/lib/src/clixon_json_parse.l @@ -139,7 +139,6 @@ hex [A-Fa-f0-9] %% - /*! Initialize scanner. */ int @@ -166,4 +165,3 @@ json_scan_exit(clixon_json_yacc *jy) clixon_json_parselex_destroy(); /* modern */ return 0; } - diff --git a/lib/src/clixon_json_parse.y b/lib/src/clixon_json_parse.y index 708c72a0..f8e104a0 100644 --- a/lib/src/clixon_json_parse.y +++ b/lib/src/clixon_json_parse.y @@ -333,4 +333,3 @@ number : J_NUMBER { $$ = $1; } ; %% - diff --git a/lib/src/clixon_nacm.c b/lib/src/clixon_nacm.c index ac2ce20d..87d734d8 100644 --- a/lib/src/clixon_nacm.c +++ b/lib/src/clixon_nacm.c @@ -1088,7 +1088,6 @@ nacm_datanode_read(clixon_handle h, return retval; } - /*--------------------------------------------------------------- * NACM pre-procesing */ diff --git a/lib/src/clixon_plugin.c b/lib/src/clixon_plugin.c index f7f0e7fe..750c9bc2 100644 --- a/lib/src/clixon_plugin.c +++ b/lib/src/clixon_plugin.c @@ -501,7 +501,6 @@ clixon_pseudo_plugin(clixon_handle h, return plugin_add_one(h, name, NULL, NULL, cpp); } - /*! Call single plugin start callback * * @param[in] cp Plugin handle diff --git a/lib/src/clixon_regex.c b/lib/src/clixon_regex.c index 4545a3b8..3440f434 100644 --- a/lib/src/clixon_regex.c +++ b/lib/src/clixon_regex.c @@ -154,7 +154,6 @@ utf16_literal_to_utf8(const unsigned char *const input, int len, goto fail; } - /* calculate the unicode codepoint from the surrogate pair */ codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF)); } else { @@ -471,4 +470,3 @@ regex_free(clixon_handle h, done: return retval; } - diff --git a/lib/src/clixon_stream.c b/lib/src/clixon_stream.c index 79142d06..6027afbb 100644 --- a/lib/src/clixon_stream.c +++ b/lib/src/clixon_stream.c @@ -713,7 +713,6 @@ stream_notify_xml(clixon_handle h, return retval; } - /*! Replay a stream by sending notification messages * * @see RFC5277 Sec 2.1.1: diff --git a/lib/src/clixon_string.c b/lib/src/clixon_string.c index bdb09241..9a741265 100644 --- a/lib/src/clixon_string.c +++ b/lib/src/clixon_string.c @@ -850,7 +850,6 @@ xml_chardata_decode(char **decp, return retval; } - /*! Split a string into a cligen variable vector using 1st and 2nd delimiter * * (1) Split a string into elements delimited by delim1, diff --git a/lib/src/clixon_text_syntax_parse.y b/lib/src/clixon_text_syntax_parse.y index 0bb953fc..f8a56dea 100644 --- a/lib/src/clixon_text_syntax_parse.y +++ b/lib/src/clixon_text_syntax_parse.y @@ -298,4 +298,3 @@ substr : substr TOKEN { _PARSE_DEBUG("substr->substr TOKEN"); ; %% - diff --git a/lib/src/clixon_validate.c b/lib/src/clixon_validate.c index 8b60ac20..e6f2b3b4 100644 --- a/lib/src/clixon_validate.c +++ b/lib/src/clixon_validate.c @@ -761,7 +761,6 @@ choice_mandatory_check(cxobj *xt, return retval; } - /*! Find yang node which is ancestor of ys (or ys itself) and child of ytop * * Assume tree: ytop ... ys diff --git a/lib/src/clixon_xml.c b/lib/src/clixon_xml.c index 872a5888..0447f05a 100644 --- a/lib/src/clixon_xml.c +++ b/lib/src/clixon_xml.c @@ -2169,7 +2169,6 @@ cxvec_prepend(cxobj *x, } #endif - /*! Apply a function call recursively on all xml node children recursively * * Recursively traverse all xml nodes in a parse-tree and apply fn(arg) for diff --git a/lib/src/clixon_xml_parse.y b/lib/src/clixon_xml_parse.y index 39158340..06337ec6 100644 --- a/lib/src/clixon_xml_parse.y +++ b/lib/src/clixon_xml_parse.y @@ -123,7 +123,6 @@ xml_parse_content(clixon_xml_yacc *xy, cxobj *xn = xy->xy_xelement; cxobj *xp = xy->xy_xparent; - xy->xy_xelement = NULL; /* init */ if (xn == NULL){ if ((xn = xml_new("body", xp, CX_BODY)) == NULL) @@ -487,7 +486,6 @@ pi : BQMARK NAME EQMARK {_PARSE_DEBUG("pi -> "); free($2); } { _PARSE_DEBUG("pi -> "); free($2); free($3);} ; - attrs : attrs attr { _PARSE_DEBUG("attrs -> attrs attr"); } | { _PARSE_DEBUG("attrs ->"); } ; diff --git a/lib/src/clixon_xml_vec.c b/lib/src/clixon_xml_vec.c index b78d6588..45574720 100644 --- a/lib/src/clixon_xml_vec.c +++ b/lib/src/clixon_xml_vec.c @@ -385,4 +385,3 @@ clixon_xvec_print(FILE *f, return -1; return 0; } - diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c index 9078c3da..e83fc61f 100644 --- a/lib/src/clixon_xpath.c +++ b/lib/src/clixon_xpath.c @@ -158,7 +158,6 @@ static const map_str2int axis_type_map[] = { {NULL, -1} }; - /* * XPath parse tree type */ diff --git a/lib/src/clixon_xpath_ctx.c b/lib/src/clixon_xpath_ctx.c index 8447a5b9..68acef85 100644 --- a/lib/src/clixon_xpath_ctx.c +++ b/lib/src/clixon_xpath_ctx.c @@ -334,4 +334,3 @@ ctx_nodeset_replace(xp_ctx *xc, xc->xc_size = veclen; return 0; } - diff --git a/lib/src/clixon_xpath_eval.c b/lib/src/clixon_xpath_eval.c index 0e90b8bf..5f8f5dd8 100644 --- a/lib/src/clixon_xpath_eval.c +++ b/lib/src/clixon_xpath_eval.c @@ -1451,5 +1451,3 @@ xp_eval(xp_ctx *xc, ctx_free(xr0); return retval; } /* xp_eval */ - - diff --git a/lib/src/clixon_xpath_optimize.c b/lib/src/clixon_xpath_optimize.c index 90d863e1..296a97c2 100644 --- a/lib/src/clixon_xpath_optimize.c +++ b/lib/src/clixon_xpath_optimize.c @@ -158,7 +158,6 @@ xpath_optimize_init(xpath_tree **xm, return retval; } - /*! Recursive function to loop over all EXPR and pattern match them * * @param[in] xt XPath tree of type PRED @@ -366,4 +365,3 @@ xpath_optimize_check(xpath_tree *xs, return 0; /* use regular code */ #endif } - diff --git a/lib/src/clixon_xpath_parse.l b/lib/src/clixon_xpath_parse.l index bb81cd46..6656ba3d 100644 --- a/lib/src/clixon_xpath_parse.l +++ b/lib/src/clixon_xpath_parse.l @@ -196,7 +196,6 @@ ncname {namestart}{namechar}* %% - /*! Initialize scanner. */ int @@ -223,4 +222,3 @@ xpath_scan_exit(clixon_xpath_yacc *xpy) clixon_xpath_parselex_destroy(); /* modern */ return 0; } - diff --git a/lib/src/clixon_xpath_parse.y b/lib/src/clixon_xpath_parse.y index ac2d28ec..15c45c23 100644 --- a/lib/src/clixon_xpath_parse.y +++ b/lib/src/clixon_xpath_parse.y @@ -567,6 +567,4 @@ string : string CHARS { | CHARS { _PARSE_DEBUG("string-> "); } ; - %% - diff --git a/lib/src/clixon_yang_parse.l b/lib/src/clixon_yang_parse.l index ef649ac2..a9f0b5c2 100644 --- a/lib/src/clixon_yang_parse.l +++ b/lib/src/clixon_yang_parse.l @@ -81,7 +81,6 @@ clixon_yang_parsewrap(void) Example: keyword argument ; keyword ; keyword { keyword argument; } keyword */ - %} identifier [A-Za-z_][A-Za-z0-9_\-\.]* @@ -110,7 +109,6 @@ identifier [A-Za-z_][A-Za-z0-9_\-\.]* "/*" { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT1); } "//" { _YY->yy_lex_state = YYSTATE; BEGIN(COMMENT2); } - input { return K_INPUT; } /* No argument */ output { return K_OUTPUT;} /* No argument */ @@ -312,4 +310,3 @@ yang_scan_exit(clixon_yang_yacc *yy) clixon_yang_parselex_destroy(); /* modern */ return 0; } - diff --git a/lib/src/clixon_yang_parse.y b/lib/src/clixon_yang_parse.y index 6f9ee608..67b70206 100644 --- a/lib/src/clixon_yang_parse.y +++ b/lib/src/clixon_yang_parse.y @@ -352,7 +352,6 @@ ysp_add_push(clixon_yang_yacc *yy, return ys; } - %} %% @@ -500,7 +499,6 @@ include_substmt : revision_date_stmt { _PARSE_DEBUG("include-stmt -> revision-da | reference_stmt { _PARSE_DEBUG("include-stmt -> reference-stmt"); } ; - /* namespace-stmt = namespace-keyword sep uri-str */ namespace_stmt : K_NAMESPACE string stmtend { if (ysp_add(_yy, Y_NAMESPACE, $2, NULL)== NULL) _YYERROR("namespace_stmt"); @@ -567,7 +565,6 @@ revision_substmt : description_stmt { _PARSE_DEBUG("revision-substmt -> descript | { _PARSE_DEBUG("revision-substmt -> "); } ; - /* revision */ revision_stmts : revision_stmts revision_stmt { _PARSE_DEBUG("revision-stmts -> revision-stmts revision-stmt"); } @@ -627,7 +624,6 @@ argument_substmt : yin_element_stmt1 { _PARSE_DEBUG("argument-substmt -> yin-ele | ; - /* Example of optional rule, eg [yin-element-stmt] */ yin_element_stmt1 : K_YIN_ELEMENT bool_str stmtend {free($2);} ; @@ -1061,7 +1057,6 @@ grouping_substmt : status_stmt { _PARSE_DEBUG("grouping-substmt -> status- | { _PARSE_DEBUG("grouping-substmt -> "); } ; - /* container */ container_stmt : K_CONTAINER identifier_str ';' { if (ysp_add(_yy, Y_CONTAINER, $2, NULL) == NULL) _YYERROR("container_stmt"); @@ -1896,7 +1891,6 @@ bool_str : '"' BOOL '"' { $$ = $2; _PARSE_DEBUG("bool_str -> BOOL ");} ; - /* ;;; Basic Rules */ /* identifier-ref-arg-str = < a string that matches the rule idenetifier-ref-arg > diff --git a/lib/src/clixon_yang_schema_mount.c b/lib/src/clixon_yang_schema_mount.c index 2d29600c..245c20eb 100644 --- a/lib/src/clixon_yang_schema_mount.c +++ b/lib/src/clixon_yang_schema_mount.c @@ -908,7 +908,6 @@ yang_schema_yspec_rm(clixon_handle h, int retval = -1; yang_stmt *yspec = NULL; char *xpath = NULL; - int ret; if ((ret = xml_yang_mount_get(h, xmnt, NULL, &xpath, &yspec)) < 0) diff --git a/lib/src/clixon_yang_schemanode_parse.y b/lib/src/clixon_yang_schemanode_parse.y index 5df09178..80c21dd8 100644 --- a/lib/src/clixon_yang_schemanode_parse.y +++ b/lib/src/clixon_yang_schemanode_parse.y @@ -197,4 +197,3 @@ identifier : IDENTIFIER ; %% - diff --git a/lib/src/clixon_yang_sub_parse.y b/lib/src/clixon_yang_sub_parse.y index f44bb2bb..20a87953 100644 --- a/lib/src/clixon_yang_sub_parse.y +++ b/lib/src/clixon_yang_sub_parse.y @@ -290,4 +290,3 @@ sep1 : sep1 SEP { _PARSE_DEBUG("sep->sep SEP"); } ; %% - diff --git a/lib/src/clixon_yang_type.c b/lib/src/clixon_yang_type.c index 3e1a5cd7..49c36a93 100644 --- a/lib/src/clixon_yang_type.c +++ b/lib/src/clixon_yang_type.c @@ -464,7 +464,6 @@ cv_validate_pattern(clixon_handle h, ((rmin && (i) < cv_##type##_get(rmin)) || \ (rmax && (i) > cv_##type##_get(rmax))) - /*! Error messsage for int violating ranges * * @note contains kludge - duplicate loop