From bef66d88b90643ff404926746604185633828e7a Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 29 Jun 2016 16:48:09 +0200 Subject: [PATCH] core: fix spelling errors catched by lintian #688 --- cfg/cfg_ctx.c | 2 +- cfg/cfg_ctx.h | 4 ++-- daemonize.c | 2 +- examples/im_gw.cfg | 2 +- examples/obsoleted/sercheck | 4 ++-- examples/uas.cfg | 2 +- lib/binrpc/binrpc_api.h | 2 +- lib/cds/doc/pop_message.xml | 4 ++-- lib/cds/sip_utils.h | 4 ++-- lib/srdb1/db.c | 2 +- lib/srdb1/db.h | 2 +- lib/xcap/msg_rules.c | 2 +- lib/xcap/pres_rules.c | 2 +- pass_fd.c | 2 +- tcp_read.c | 4 ++-- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 7d27246e99c..87ccda81c43 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -1425,7 +1425,7 @@ int cfg_diff_init(cfg_ctx_t *ctx, * return value: * 1: valid value is found * 0: no more changed value found - * -1: error occured + * -1: error occurred */ int cfg_diff_next(void **h, str *gname, unsigned int **gid, str *vname, diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index abcb42446fd..9401daed774 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -168,7 +168,7 @@ int cfg_diff_init(cfg_ctx_t *ctx, * return value: * 1: valid value is found * 0: no more changed value found - * -1: error occured + * -1: error occurred * * * can be used as follows: @@ -184,7 +184,7 @@ int cfg_diff_init(cfg_ctx_t *ctx, * } * cfg_diff_release(ctx); * if (err) { - * error occured, the changes cannot be retrieved + * error occurred, the changes cannot be retrieved * ... * } */ diff --git a/daemonize.c b/daemonize.c index 524021d7047..0b3d91c6aef 100644 --- a/daemonize.c +++ b/daemonize.c @@ -196,7 +196,7 @@ void daemon_status_no_wait() /** * enable dumpable flag for core dumping after setuid() & friends - * @return 0 when no critical error occured, -1 on such error + * @return 0 when no critical error occurred, -1 on such error */ int enable_dumpable(void) { diff --git a/examples/im_gw.cfg b/examples/im_gw.cfg index 614239e6dad..59e3eb1f74b 100644 --- a/examples/im_gw.cfg +++ b/examples/im_gw.cfg @@ -96,7 +96,7 @@ route{ break; }; - # error occured ... + # error occurred ... if (! t_newtran()) { sl_reply_error(); diff --git a/examples/obsoleted/sercheck b/examples/obsoleted/sercheck index 414244c9cd7..50dd9f5837e 100755 --- a/examples/obsoleted/sercheck +++ b/examples/obsoleted/sercheck @@ -35,7 +35,7 @@ fi if [ $PROCCNT -ne $ALL ] ; then cd $SERDIR - echo "Alarm: ser restart occured on `date` at $HOSTNAME" > $TMP + echo "Alarm: ser restart occurred on `date` at $HOSTNAME" > $TMP if [ -r $BIN -a -r $CORE ] ; then echo "----------------------------------" >> $TMP DATE=`date "+%Y-%m-%d--%H-%M"` @@ -51,6 +51,6 @@ if [ $PROCCNT -ne $ALL ] ; then fi /etc/init.d/sr restart - mail -s "ser restart occured" $NOTIFY < $TMP + mail -s "ser restart occurred" $NOTIFY < $TMP rm -f $TMP fi diff --git a/examples/uas.cfg b/examples/uas.cfg index 3642d7f8edc..a4c05e13e1e 100644 --- a/examples/uas.cfg +++ b/examples/uas.cfg @@ -26,7 +26,7 @@ route{ break; }; - # create transaction state; abort if error occured + # create transaction state; abort if error occurred if ( !t_newtran()) { sl_reply_error(); break; diff --git a/lib/binrpc/binrpc_api.h b/lib/binrpc/binrpc_api.h index c04394a49cc..a2c31a7f336 100644 --- a/lib/binrpc/binrpc_api.h +++ b/lib/binrpc/binrpc_api.h @@ -261,7 +261,7 @@ void binrpc_set_mallocs(void* _malloc, void* _realloc, void* _free); * Function: binrpc_get_last_errs * * Description: - * The function returns last error that occured when function returned FATAL_ERROR + * The function returns last error that occurred when function returned FATAL_ERROR * * */ char *binrpc_get_last_errs(); diff --git a/lib/cds/doc/pop_message.xml b/lib/cds/doc/pop_message.xml index 36538c76bd2..c0c4cd23b70 100644 --- a/lib/cds/doc/pop_message.xml +++ b/lib/cds/doc/pop_message.xml @@ -28,7 +28,7 @@ Description Removes first message from the queue. If the queue is empty or an error -occured it returns NULL value. Removed messages are NOT automaticaly freed - +occurred it returns NULL value. Removed messages are NOT automaticaly freed - caller must use free_message or free it itself (see )! @@ -37,7 +37,7 @@ linkend="free_message"/>)! Return value Returns pointer to message removed from the queue. If the queue is empty -or an error occured the return value is NULL. +or an error occurred the return value is NULL. diff --git a/lib/cds/sip_utils.h b/lib/cds/sip_utils.h index 2f548185699..df086ad6ff9 100644 --- a/lib/cds/sip_utils.h +++ b/lib/cds/sip_utils.h @@ -13,11 +13,11 @@ int get_expiration_value(struct sip_msg *m, int *value); int is_terminating_notify(struct sip_msg *m); /* returns 1 if given extension is in Supported headers, - * 0 if not or an error occured while parsing */ + * 0 if not or an error occurred while parsing */ int supports_extension(struct sip_msg *m, str *extension); /* returns 1 if given extension is in Require headers, - * 0 if not or an error occured while parsing */ + * 0 if not or an error occurred while parsing */ int requires_extension(struct sip_msg *m, str *extension); /** diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index fda8f9eaa2b..d0116c7e7d3 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -427,7 +427,7 @@ int db_table_version(const db_func_t* dbf, db1_con_t* connection, const str* tab /*! \brief * Check the table version - * 0 means ok, -1 means an error occured + * 0 means ok, -1 means an error occurred */ int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version) { diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 4c18542c123..0ea5c4d5f2c 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -507,7 +507,7 @@ int db_table_version(const db_func_t* dbf, db1_con_t* con, const str* table); * \param dbh database connection handle * \param table checked table * \param version checked version - * \return 0 means ok, -1 means an error occured + * \return 0 means ok, -1 means an error occurred */ int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, const unsigned int version); diff --git a/lib/xcap/msg_rules.c b/lib/xcap/msg_rules.c index bd047b66527..ee5d43baa8b 100644 --- a/lib/xcap/msg_rules.c +++ b/lib/xcap/msg_rules.c @@ -62,7 +62,7 @@ int get_msg_rules(const str_t *username, const str_t *filename, /* parse input data */ res = parse_msg_rules(data, dsize, dst); if (res != RES_OK) { - ERROR_LOG("Error occured during document parsing!\n"); + ERROR_LOG("Error occurred during document parsing!\n"); } if (data) cds_free(data); diff --git a/lib/xcap/pres_rules.c b/lib/xcap/pres_rules.c index afd658d0649..0933047cf61 100644 --- a/lib/xcap/pres_rules.c +++ b/lib/xcap/pres_rules.c @@ -63,7 +63,7 @@ int get_pres_rules(const str_t *username, const str_t *filename, /* parse input data */ res = parse_pres_rules(data, dsize, dst); if (res != RES_OK) { - ERROR_LOG("Error occured during parsing pres-rules for %.*s!\n", + ERROR_LOG("Error occurred during parsing pres-rules for %.*s!\n", str_len(username), username ? username->s : ""); } diff --git a/pass_fd.c b/pass_fd.c index edb1480f690..7cb726d7722 100644 --- a/pass_fd.c +++ b/pass_fd.c @@ -53,7 +53,7 @@ * and if no data is queued on the fd, recv_all will not wait (it will * return error and set errno to EAGAIN/EWOULDBLOCK). However if even 1 byte * is queued, the call will block until the whole data_len was read or an - * error or eof occured ("semi-nonblocking" behaviour, some tcp code + * error or eof occurred ("semi-nonblocking" behaviour, some tcp code * counts on it). * if flags is set to MSG_WAITALL it will block even if no byte is available. * diff --git a/tcp_read.c b/tcp_read.c index 84ddf90ffc3..499db29bffe 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -1610,7 +1610,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) #endif /* USE_TLS */ resp=tcp_read_req(con, &n, &read_flags); if (unlikely(resp<0)){ - /* some error occured, but on the new fd, not on the tcp + /* some error occurred, but on the new fd, not on the tcp * main fd, so keep the ret value */ if (unlikely(resp!=CONN_EOF)) con->state=S_CONN_BAD; @@ -1669,7 +1669,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) resp=tcp_read_req(con, &ret, &read_flags); if (unlikely(resp<0)){ read_error: - ret=-1; /* some error occured */ + ret=-1; /* some error occurred */ if (unlikely(io_watch_del(&io_w, con->fd, idx, IO_FD_CLOSING) < 0)){ LM_CRIT("io_watch_del failed for %p id %d fd %d,"