core: updated log macros for parse rpid

(cherry picked from commit a526764)

src/core/parser/parse_rpid.c

@@ -13,8 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
@@ -23,7 +23,7 @@
  *
  * \ingroup parser
  */
- 
+
 #include "parse_from.h"
 #include "parse_to.h"
 #include <stdlib.h>
@@ -33,7 +33,7 @@
 #include "../ut.h"
 #include "../mem/mem.h"
 
- 
+
 /*! \brief
  * This method is used to parse RPID header.
  *
@@ -44,34 +44,34 @@
 int parse_rpid_header( struct sip_msg *msg )
 {
 	struct to_body* rpid_b;
-	
- 	if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) {
- 		goto error;
- 	}
- 
- 	/* maybe the header is already parsed! */
- 	if (msg->rpid->parsed)
- 		return 0;
- 
- 	/* bad luck! :-( - we have to parse it */
- 	/* first, get some memory */
- 	rpid_b = pkg_malloc(sizeof(struct to_body));
- 	if (rpid_b == 0) {
- 		LOG(L_ERR, "ERROR:parse_rpid_header: out of pkg_memory\n");
- 		goto error;
- 	}
- 
- 	/* now parse it!! */
- 	memset(rpid_b, 0, sizeof(struct to_body));
- 	parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b);
- 	if (rpid_b->error == PARSE_ERROR) {
- 		LOG(L_ERR, "ERROR:parse_rpid_header: bad rpid header\n");
- 		free_to(rpid_b);
- 		goto error;
- 	}
- 	msg->rpid->parsed = rpid_b;
- 
- 	return 0;
- error:
- 	return -1;
+
+	if ( !msg->rpid && (parse_headers(msg, HDR_RPID_F, 0)==-1 || !msg->rpid)) {
+		goto error;
+	}
+
+	/* maybe the header is already parsed! */
+	if (msg->rpid->parsed)
+		return 0;
+
+	/* needs to parse it */
+	/* first, get some memory */
+	rpid_b = pkg_malloc(sizeof(struct to_body));
+	if (rpid_b == 0) {
+		LM_ERR("out of pkg_memory\n");
+		goto error;
+	}
+
+	/* now parse it!! */
+	memset(rpid_b, 0, sizeof(struct to_body));
+	parse_to(msg->rpid->body.s,msg->rpid->body.s+msg->rpid->body.len+1,rpid_b);
+	if (rpid_b->error == PARSE_ERROR) {
+		LM_ERR("bad rpid header\n");
+		free_to(rpid_b);
+		goto error;
+	}
+	msg->rpid->parsed = rpid_b;
+
+	return 0;
+error:
+	return -1;
 }