Fix various typos, phrases & small issues; Update contribs

(cherry picked from commit 86f6e0c)

lib/cJSON.h

@@ -50,8 +50,8 @@ extern const char* cJSON_Version(void);
 #define cJSON_Object (1 << 6)
 #define cJSON_Raw    (1 << 7) /* raw json */
 
-#define cJSON_IsReference 256
-#define cJSON_StringIsConst 512
+#define cJSON_IsReference   (1 << 8)
+#define cJSON_StringIsConst (1 << 9)
 
 /* The cJSON structure: */
 typedef struct cJSON

lib/dbg/struct_hist.c

@@ -121,7 +121,7 @@ void shl_destroy(struct struct_hist_list *shl)
 	if (!shl)
 		return;
 
-	list_for_each_safe(el, next, &shl->objects) {
+	list_for_each_safe (el, next, &shl->objects) {
 		sh = list_entry(el, struct struct_hist, list);
 		sh_free(sh);
 	}

modules/dispatcher/doc/dispatcher_admin.xml

@@ -378,7 +378,7 @@ modparam("dispatcher", "ds_probing_mode", 1)
 		</para>
 		<para>
 		<emphasis>
-			Default value is <quote>NULL(none)</quote>.
+			Default value is <quote>NULL (probe all sets)</quote>.
 		</emphasis>
 		</para>
 		<example>

modules/tls_mgm/doc/tls_mgm_admin.xml

@@ -992,13 +992,13 @@ modparam("tls_mgm", "tls_method", "[dom1]tlsv1")
 modparam("tls_mgm", "verify_cert", "[dom1]1")
 modparam("tls_mgm", "require_cert", "[dom1]1")
 
-#'biloxy' server domain
+#'biloxi' server domain
 modparam("tls_mgm", "server_domain", "dom2")
 modparam("tls_mgm", "match_ip_address", "[dom2]10.0.0.10:5061")
-modparam("tls_mgm", "match_sip_domain", "[dom2]biloxy.com")
+modparam("tls_mgm", "match_sip_domain", "[dom2]biloxi.com")
 
-modparam("tls_mgm", "certificate", "[dom2]/certs/biloxy.com/cert.pem")
-modparam("tls_mgm", "private_key", "[dom2]/certs/biloxy.com/privkey.pem")
+modparam("tls_mgm", "certificate", "[dom2]/certs/biloxi.com/cert.pem")
+modparam("tls_mgm", "private_key", "[dom2]/certs/biloxi.com/privkey.pem")
 modparam("tls_mgm", "ca_list", "[dom2]/certs/wellknownCAs")
 modparam("tls_mgm", "tls_method", "[dom2]tlsv1")
 modparam("tls_mgm", "verify_cert", "[dom2]1")
@@ -1029,13 +1029,13 @@ modparam("tls_mgm", "tls_method", "[dom4]tlsv1")
 modparam("tls_mgm", "verify_cert", "[dom4]1")
 modparam("tls_mgm", "require_cert", "[dom4]1")
 
-# 'biloxy' client domain
+# 'biloxi' client domain
 modparam("tls_mgm", "client_domain", "dom5")
 modparam("tls_mgm", "match_ip_address", "[dom5]*")
-modparam("tls_mgm", "match_sip_domain", "[dom5]biloxy.com")
+modparam("tls_mgm", "match_sip_domain", "[dom5]biloxi.com")
 
-modparam("tls_mgm", "certificate", "[dom5]/certs/biloxy.com/cert.pem")
-modparam("tls_mgm", "private_key", "[dom5]/certs/biloxy.com/privkey.pem")
+modparam("tls_mgm", "certificate", "[dom5]/certs/biloxi.com/cert.pem")
+modparam("tls_mgm", "private_key", "[dom5]/certs/biloxi.com/privkey.pem")
 modparam("tls_mgm", "ca_list", "[dom5]/certs/wellknownCAs")
 modparam("tls_mgm", "tls_method", "[dom5]tlsv1")
 modparam("tls_mgm", "verify_cert", "[dom5]1")

modules/uac/replace.c

@@ -235,7 +235,7 @@ static inline struct lump* get_display_anchor(struct sip_msg *msg,
  * Expand the @uri buffer to include its enclosing left-angle quotes
  * (< and >), if they are present within the given @llim and @rlim boundaries.
  */
-static void expand_aquotes(str *uri, const char *llim, const char *rlim)
+static inline void expand_aquotes(str *uri, const char *llim, const char *rlim)
 {
 	char *p;
 

modules/usrloc/doc/usrloc_admin.xml

@@ -57,18 +57,18 @@
 		OpenSIPS user location cluster, registrar nodes will only publish some
 		light "metadata" entries for any new Addresses-of-Record which are
 		reachable from them. These entries will cause other nodes to also fork
-		additional SIP branches pointing to the above-mentioned registrar upon
-		receiving a call for the above-mentioned Addresses-of-Record.
+		additional SIP branches pointing to the publisher registrar upon
+		receiving calls for its advertised Addresses-of-Record.
 		</para>
 		<para>
 		The <emphasis role='bold'>federation</emphasis> topology is an
 		optimized solution for the following core problems:
 		<itemizedlist>
 			<listitem>
 			<para>
-			<emphasis role='bold'>IP restrictions</emphasis> - In some cases,
-			calls routed towards registered contacts must necessarily egress
-			through the original registration nodes of these contacts. A
+			<emphasis role='bold'>IP address restrictions</emphasis> - In some
+			cases, calls routed towards registered contacts must necessarily
+			pass through the original registration nodes of these contacts. A
 			classic example of this situation is when an OpenSIPS registrar
 			sitting at the edge of the platform is directly facing a NAT device
 			on the way to the contact. Unless calls are sent out from this
@@ -1794,7 +1794,8 @@ modparam("usrloc", "mi_dump_kv_store", 1)
 				</emphasis> pseudo-variable in order to perform the check).
 			</para>
 			<para><emphasis>NOTICE: </emphasis>If a contact has no shared tag
-				attached to it, this key will map to a "" (empty string) value!
+				attached to it, the value of this parameter will be "" (empty
+				string)!
 			</para></listitem>
 		</itemizedlist>
 	</section>

modules/usrloc/urecord.c

@@ -785,7 +785,7 @@ void release_urecord(urecord_t* _r, char is_replicated)
 int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci,
 										ucontact_t** _c, char is_replicated)
 {
-	int first_contact = _r->contacts == NULL ? 1 : 0;
+	int first_contact = !_r->contacts;
 
 	/* not used in db only mode */
 	if (_ci->contact_id == 0) {