[SR-Dev] git:master: core: Consolidate append_str macro usage

Jan Janak jan at iptel.org
Wed May 6 14:47:27 CEST 2009


Module: sip-router
Branch: master
Commit: 47945782e1459935b1f327abb92fbc1a3ffcd86f
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47945782e1459935b1f327abb92fbc1a3ffcd86f

Author: Jan Janak <jan at iptel.org>
Committer: Jan Janak <jan at iptel.org>
Date:   Wed May  6 14:47:14 2009 +0200

core: Consolidate append_str macro usage

The definition of append_str macro was scattered across the source tree,
there were multiple definition of the macro, some of them with different
parameters.

This patch brings the definition of append_str macro into ut.h header
file and removes all other definitions from core and modules.

We chose the version with three parameters where the pointer and the
length of the source string are passed separately to the macro. This is
more flexible than passing both of them within one parameter as str
structure.

All references to append_mem_block have been removed because the same
operation can now be achieved with append_str. In addition to that we
updated parameters passed to append_str where needed, converting one
str parameter to <pointer,len> pair of parameters.

Some modules had yet another version of append_str defined, there we
renamed the macro to some other name to make sure that the local
definition does not conflict with the definition on ut.h

---

 lib/kcore/km_ut.h                 |   11 ----
 modules/tm/t_fifo.c               |    8 ++--
 modules/tm/t_funcs.h              |   16 ------
 modules/tm/t_msgbuilder.c         |   96 ++++++++++++++++++------------------
 modules/tm/t_serial.c             |    8 ++--
 modules_s/acc_syslog/acc_syslog.c |    8 ++--
 modules_s/sms/sms_funcs.c         |    4 --
 msg_translator.c                  |    6 --
 ut.h                              |   12 +++++
 9 files changed, 72 insertions(+), 97 deletions(-)

Diff:   http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=47945782e1459935b1f327abb92fbc1a3ffcd86f



More information about the sr-dev mailing list