diff --git a/src/modules/htable/api.c b/src/modules/htable/api.c index 5b4a61af9fb..21680738fa5 100644 --- a/src/modules/htable/api.c +++ b/src/modules/htable/api.c @@ -41,7 +41,7 @@ int ht_api_set_cell(str *hname, str *name, int type, return -1; if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, hname, name, type, val, mode)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } return ht_set_cell(ht, name, type, val, mode); @@ -57,7 +57,7 @@ int ht_api_del_cell(str *hname, str *name) if(ht==NULL) return -1; if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, hname, name, 0, NULL, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } return ht_del_cell(ht, name); } @@ -73,7 +73,7 @@ int ht_api_set_cell_expire(str *hname, str *name, if(ht==NULL) return -1; if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, hname, name, type, val, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } return ht_set_cell_expire(ht, name, type, val); } @@ -118,7 +118,7 @@ int ht_api_rm_cell_re(str *hname, str *sre, int mode) isval.s.s = sre->s; isval.s.len = sre->len; if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, hname, NULL, AVP_VAL_STR, &isval, mode)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } } if(ht_rm_cell_re(sre, ht, mode /* 0 - name; 1 - value */)<0) diff --git a/src/modules/htable/ht_api.c b/src/modules/htable/ht_api.c index b31d96cd7b5..d4310afa3d7 100644 --- a/src/modules/htable/ht_api.c +++ b/src/modules/htable/ht_api.c @@ -314,7 +314,7 @@ int ht_add_table(str *name, int autoexp, str *dbtable, str *dbcols, int size, if(dbcols!=NULL && dbcols->s!=NULL && dbcols->len>0) { ht->scols[0].s = (char*)shm_malloc((1+dbcols->len)*sizeof(char)); if(ht->scols[0].s==NULL) { - LM_ERR("no more shm memory\n"); + LM_ERR("no more shared memory\n"); shm_free(ht); return -1; } @@ -394,7 +394,7 @@ int ht_init_tables(void) ht->entries = (ht_entry_t*)shm_malloc(ht->htsize*sizeof(ht_entry_t)); if(ht->entries==NULL) { - LM_ERR("no more shm for [%.*s]\n", ht->name.len, ht->name.s); + LM_ERR("no more shared memory for [%.*s]\n", ht->name.len, ht->name.s); shm_free(ht); return -1; } @@ -472,7 +472,7 @@ int ht_set_cell_ex(ht_t *ht, str *name, int type, int_str *val, int mode, time_t now; if(ht==NULL || ht->entries==NULL) { - LM_WARN("invalid ht parameter\n"); + LM_WARN("invalid htable parameter\n"); return -1; } if(name==NULL || name->s==NULL) { @@ -935,7 +935,7 @@ int ht_dbg(void) ht = _ht_root; while(ht) { - LM_ERR("===== htable[%.*s] hid: %u exp: %u>\n", ht->name.len, + LM_ERR("htable[%.*s] hid: %u exp: %u>\n", ht->name.len, ht->name.s, ht->htid, ht->htexpire); for(i=0; ihtsize; i++) { @@ -1081,7 +1081,7 @@ int ht_db_sync_tables(void) ht->name.len, ht->name.s); ht_db_delete_records(&ht->dbtable); if(ht_db_save_table(ht, &ht->dbtable)!=0) - LM_ERR("failed sync'ing hash table [%.*s] to db\n", + LM_ERR("failed syncing hash table [%.*s] to db\n", ht->name.len, ht->name.s); } ht = ht->next; diff --git a/src/modules/htable/ht_var.c b/src/modules/htable/ht_var.c index 74b8e4e9db9..42598530c4b 100644 --- a/src/modules/htable/ht_var.c +++ b/src/modules/htable/ht_var.c @@ -94,7 +94,7 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &hpv->htname, &htname, 0, NULL, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } ht_del_cell(hpv->ht, &htname); return 0; @@ -106,7 +106,7 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &isval, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(hpv->ht, &htname, 0, &isval, 1)!=0) { @@ -118,7 +118,7 @@ int pv_set_ht_cell(struct sip_msg* msg, pv_param_t *param, if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, AVP_VAL_STR, &isval, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(hpv->ht, &htname, AVP_VAL_STR, &isval, 1)!=0) { @@ -264,7 +264,7 @@ int pv_set_ht_cell_expire(struct sip_msg* msg, pv_param_t *param, isval.n = val->ri; } if (hpv->ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, &hpv->htname, &htname, 0, &isval, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell_expire(hpv->ht, &htname, 0, &isval)!=0) { @@ -366,7 +366,7 @@ int pv_get_ht_add(struct sip_msg *msg, pv_param_t *param, /* integer */ if (hpv->ht->dmqreplicate>0) { if (ht_dmq_replicate_action(HT_DMQ_SET_CELL, &hpv->htname, &htname, 0, &htc->value, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } } return pv_get_sintval(msg, param, res, htc->value.n); diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index d8919b15835..a20b3d6e8d4 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -391,7 +391,7 @@ static int ht_rm_re_helper(sip_msg_t *msg, ht_t *ht, str *rexp, int rmode) isval.s = *rexp; if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &ht->name, NULL, AVP_VAL_STR, &isval, rmode)!=0) { - LM_ERR("dmq relication failed for [%.*s]\n", ht->name.len, ht->name.s); + LM_ERR("dmq replication failed for [%.*s]\n", ht->name.len, ht->name.s); } } if(ht_rm_cell_re(rexp, ht, rmode)<0) @@ -499,7 +499,7 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, isval.s = *val; if ((ht->dmqreplicate > 0) && ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &ht->name, NULL, AVP_VAL_STR, &isval, mkey)!=0) { - LM_ERR("dmq relication failed (op %d)\n", mkey); + LM_ERR("dmq replication failed (op %d)\n", mkey); } if(ht_rm_cell_re(val, ht, mkey)<0) { return -1; @@ -509,7 +509,7 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, isval.s = *val; if ((ht->dmqreplicate > 0) &&ht_dmq_replicate_action(HT_DMQ_RM_CELL_SW, &ht->name, NULL, AVP_VAL_STR, &isval, mkey)!=0) { - LM_ERR("dmq relication failed (op %d)\n", mkey); + LM_ERR("dmq replication failed (op %d)\n", mkey); } if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; @@ -582,7 +582,7 @@ static int ki_ht_rm(sip_msg_t* msg, str* hname, str* iname) if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, hname, iname, 0, NULL, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } ht_del_cell(ht, iname); return 1; @@ -1183,7 +1183,7 @@ static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &ht->name, itname, AVP_VAL_STR, &isvalue, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { @@ -1214,7 +1214,7 @@ static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &ht->name, itname, 0, &isvalue, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { @@ -1248,7 +1248,7 @@ static int ki_ht_setex(sip_msg_t *msg, str *htname, str *itname, int itval) if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL_EXPIRE, htname, itname, 0, &isval, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell_expire(ht, itname, 0, &isval)!=0) { LM_ERR("cannot set expire for sht: %.*s key: %.*s\n", htname->len, @@ -1375,7 +1375,7 @@ static int ki_ht_add_op(sip_msg_t *msg, str *htname, str *itname, int itval) if (ht->dmqreplicate>0) { if (ht_dmq_replicate_action(HT_DMQ_SET_CELL, htname, itname, 0, &htc->value, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } } return htc->value.n; @@ -1450,7 +1450,7 @@ static void htable_rpc_delete(rpc_t* rpc, void* c) { } if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, &ht->name, &keyname, 0, NULL, 0)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } ht_del_cell(ht, &keyname); @@ -1551,7 +1551,7 @@ static void htable_rpc_sets(rpc_t* rpc, void* c) { if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &ht->name, &keyname, AVP_VAL_STR, &keyvalue, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(ht, &keyname, AVP_VAL_STR, &keyvalue, 1)!=0) @@ -1586,7 +1586,7 @@ static void htable_rpc_seti(rpc_t* rpc, void* c) { if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, &ht->name, &keyname, 0, &keyvalue, 1)!=0) { - LM_ERR("dmq relication failed\n"); + LM_ERR("dmq replication failed\n"); } if(ht_set_cell(ht, &keyname, 0, &keyvalue, 1)!=0)