Skip to content

Commit

Permalink
Remove extra lines
Browse files Browse the repository at this point in the history
  • Loading branch information
@olofhagsand
olofhagsand committed Dec 5, 2024
1 parent 3332dfe commit 69eaf98
Show file tree
Hide file tree
Showing 72 changed files with 1 addition and 98 deletions.
1 change: 0 additions & 1 deletion apps/backend/backend_socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/


#ifndef _BACKEND_SOCKET_H_
#define _BACKEND_SOCKET_H_

Expand Down
1 change: 0 additions & 1 deletion apps/backend/backend_startup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ running |--------+------------> RUNNING
parse validate OK / commit
startup -------+--+-------+------------+
INVALID (requires manual edit of candidate)
failsafe ----------------------+
reset \ commit
Expand Down
1 change: 0 additions & 1 deletion apps/backend/backend_startup.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/


#ifndef _BACKEND_STARTUP_H_
#define _BACKEND_STARTUP_H_

Expand Down
1 change: 0 additions & 1 deletion apps/backend/clixon_backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,3 @@ extern "C" {
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion apps/backend/clixon_backend_commit.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/


#ifndef _CLIXON_BACKEND_COMMIT_H_
#define _CLIXON_BACKEND_COMMIT_H_

Expand Down
1 change: 0 additions & 1 deletion apps/backend/clixon_backend_handle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,3 @@ backend_client_print(clixon_handle h,
}
return 0;
}

1 change: 0 additions & 1 deletion apps/backend/clixon_backend_transaction.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down
1 change: 0 additions & 1 deletion apps/cli/cli_autocli.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ static const map_str2int list_kw_map[] = {
{NULL, -1}
};


static int
autocli_str2op(char *str)
{
Expand Down
1 change: 0 additions & 1 deletion apps/cli/cli_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
1 change: 0 additions & 1 deletion apps/cli/cli_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -796,4 +796,3 @@ cli_syntax_mode(clixon_handle h)
return NULL;
return cligen_ph_name_get(ph);
}

1 change: 0 additions & 1 deletion apps/cli/cli_plugin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion apps/cli/clixon_cli.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@ int plugin_exit(clixon_handle h);
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion apps/netconf/clixon_netconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,4 @@ int netconf_xpath(cxobj *xsearch,
cbuf *xf, cbuf *xf_err,
cxobj *xt);


#endif /* _CLIXON_NETCONF_H_ */
1 change: 0 additions & 1 deletion apps/netconf/netconf_filter.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,3 @@ xml_filter(cxobj *xfilter,
&remove_s);
return retval;
}

2 changes: 0 additions & 2 deletions apps/restconf/clixon_http1_parse.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -393,4 +392,3 @@ ows : RWS
;

%%

1 change: 0 additions & 1 deletion apps/restconf/clixon_http_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/clixon_restconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,3 @@ int restconf_param_set(clixon_handle h, const char *param, char *val);
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion apps/restconf/restconf_api_fcgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_api_native.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,3 @@ restconf_get_indata(void *req0)
done:
return cb;
}

4 changes: 1 addition & 3 deletions apps/restconf/restconf_err.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_err.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
1 change: 0 additions & 1 deletion apps/restconf/restconf_lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -930,4 +930,3 @@ restconf_socket_init(const char *netns0,
clixon_debug(CLIXON_DBG_RESTCONF, "retval:%d", retval);
return retval;
}

1 change: 0 additions & 1 deletion apps/restconf/restconf_main_native.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_methods.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -824,4 +824,3 @@ api_data_delete(clixon_handle h,
clixon_debug(CLIXON_DBG_RESTCONF, "retval:%d", retval);
return retval;
}

1 change: 0 additions & 1 deletion apps/restconf/restconf_methods_get.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,4 +795,3 @@ api_operations_get(clixon_handle h,
xml_free(xt);
return retval;
}

1 change: 0 additions & 1 deletion apps/restconf/restconf_methods_patch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
* Restconf YANG PATCH implementation (RFC8072)
*/


#ifdef HAVE_CONFIG_H
#include "clixon_config.h" /* generated by config & autoconf */
#endif
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_methods_patch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
* Restconf YANG PATCH implementation (RFC8072)
*/


#ifndef _RESTCONF_METHODS_PATCH_H_
#define _RESTCONF_METHODS_PATCH_H_

Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_methods_post.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
* From RFC 8040 Section 4.4. POST
*/


#ifdef HAVE_CONFIG_H
#include "clixon_config.h" /* generated by config & autoconf */
#endif
Expand Down
1 change: 0 additions & 1 deletion apps/restconf/restconf_native.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1870,4 +1870,3 @@ restconf_socket_extract(clixon_handle h,
free(reason);
return retval;
}

2 changes: 0 additions & 2 deletions apps/restconf/restconf_native.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions apps/restconf/restconf_root.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -641,4 +640,3 @@ api_root_restconf(clixon_handle h,
free(path);
return retval;
}

2 changes: 0 additions & 2 deletions apps/snmp/snmp_handler.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion apps/snmp/snmp_handler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,3 @@ int clixon_snmp_table_exit(clixon_handle h);
#ifdef __cplusplus
} /* extern "C" */
#endif

3 changes: 0 additions & 3 deletions apps/snmp/snmp_lib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apps/snmp/snmp_lib.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,3 @@ int clixon_snmp_api_oid_find(oid *oid1, size_t oidlen);
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion apps/snmp/snmp_register.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@ int clixon_snmp_traverse_mibyangs(clixon_handle h);
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion lib/clixon/clixon.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,3 @@ extern const char CLIXON_VERSION[];
#ifdef __cplusplus
} /* extern "C" */
#endif

1 change: 0 additions & 1 deletion lib/clixon/clixon_handle.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
*/


#ifndef _CLIXON_HANDLE_H_
#define _CLIXON_HANDLE_H_

Expand Down
2 changes: 0 additions & 2 deletions lib/clixon/clixon_log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
1 change: 0 additions & 1 deletion lib/clixon/clixon_text_syntax.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

1 change: 0 additions & 1 deletion lib/clixon/clixon_xpath_optimize.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion lib/clixon/clixon_yang_type.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
1 change: 0 additions & 1 deletion lib/src/clixon_api_path_parse.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,3 @@ api_path_scan_exit(clixon_api_path_yacc *ay)
clixon_api_path_parselex_destroy(); /* modern */
return 0;
}

2 changes: 0 additions & 2 deletions lib/src/clixon_api_path_parse.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
%type <stack> key_values
%type <stack> key_value


%lex-param {void *_ay} /* Add this argument to parse() and lex() function */
%parse-param {void *_ay}

Expand Down Expand Up @@ -309,4 +308,3 @@ key_value : STRING { $$ = keyval_set(NULL, $1); free($1); _PARSE_DEBUG("key
;

%%

1 change: 0 additions & 1 deletion lib/src/clixon_hash.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lib/src/clixon_instance_id_parse.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,3 @@ instance_id_scan_exit(clixon_instance_id_yacc *iy)
clixon_instance_id_parselex_destroy(); /* modern */
return 0;
}

2 changes: 0 additions & 2 deletions lib/src/clixon_instance_id_parse.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,6 @@ keyval_set(char *name,
return cv;
}



%}


Expand Down
2 changes: 0 additions & 2 deletions lib/src/clixon_json.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1700,5 +1700,3 @@ clixon_json_parse_file(FILE *fp,
retval = 0;
goto done;
}


2 changes: 0 additions & 2 deletions lib/src/clixon_json_parse.l
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ hex [A-Fa-f0-9]

%%


/*! Initialize scanner.
*/
int
Expand All @@ -166,4 +165,3 @@ json_scan_exit(clixon_json_yacc *jy)
clixon_json_parselex_destroy(); /* modern */
return 0;
}

1 change: 0 additions & 1 deletion lib/src/clixon_json_parse.y
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,3 @@ number : J_NUMBER { $$ = $1; }
;

%%

1 change: 0 additions & 1 deletion lib/src/clixon_nacm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,6 @@ nacm_datanode_read(clixon_handle h,
return retval;
}


/*---------------------------------------------------------------
* NACM pre-procesing
*/
Expand Down
1 change: 0 additions & 1 deletion lib/src/clixon_plugin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 69eaf98

Please sign in to comment.