From patchwork Wed May 25 20:07:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org X-Patchwork-Id: 626447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by ozlabs.org (Postfix) with ESMTP id 3rFNcY60Svz9sDk for ; Thu, 26 May 2016 06:07:57 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 91E0C13527; Wed, 25 May 2016 20:07:56 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from 127.0.1.12 (unknown [127.0.1.12]) by lists.osmocom.org (Postfix) with ESMTPA id 4680413515; Wed, 25 May 2016 20:07:55 +0000 (UTC) Date: Wed, 25 May 2016 20:07:55 +0000 From: Holger Freyther X-Gerrit-MessageType: merged Subject: [MERGED] libsmpp34[master]: Fix various typos in log messages X-Gerrit-Change-Id: If52a8546b09ac14c00e6323984eda6d88a558830 X-Gerrit-ChangeURL: X-Gerrit-Commit: 8b61a0555ad2d2031dc4012aa8156d6b8d52226b In-Reply-To: References: MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: holger@freyther.de Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" Message-Id: <20160525200756.91E0C13527@lists.osmocom.org> Holger Freyther has submitted this change and it was merged. Change subject: Fix various typos in log messages ...................................................................... Fix various typos in log messages Change-Id: If52a8546b09ac14c00e6323984eda6d88a558830 Reviewed-on: https://gerrit.osmocom.org/115 Reviewed-by: Neels Hofmeyr Tested-by: Jenkins Builder --- M src/smpp34_dumpPdu.c M src/smpp34_pack.c M src/smpp34_unpack.c M test_apps/recv_and_unpack.inc 4 files changed, 19 insertions(+), 19 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/smpp34_dumpPdu.c b/src/smpp34_dumpPdu.c index 76cd70b..89d6e53 100644 --- a/src/smpp34_dumpPdu.c +++ b/src/smpp34_dumpPdu.c @@ -68,7 +68,7 @@ #par,inst par,dummy_b);\ if( lenval >= left ){\ PUTLOG("[%s:%08X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ snprintf((char*)dest, left, "%s", l_dest);\ @@ -86,7 +86,7 @@ "%-30s[%04X] [%s]\n",#par,inst par,dummy_b);\ if( lenval >= left ){\ PUTLOG("[%s:%04X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ snprintf((char*)dest, left, "%s", l_dest);\ @@ -104,7 +104,7 @@ #par,inst par, dummy_b);\ if( lenval >= left ){\ PUTLOG("[%s:%02X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ snprintf((char*)dest, left, "%s", l_dest);\ @@ -116,7 +116,7 @@ #par, inst par);\ if( lenval >= left ){\ PUTLOG("[%s:%s(%s)]", par, inst par, \ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ PUTLOG("[%s:%s(%s)]", par, inst par, "OK");\ @@ -143,7 +143,7 @@ lenval = *((inst par) - 1);\ if( (lenval + 33) >= left ){\ PUTLOG("[%s:%s(%s)]", par, inst par, \ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ PUTLOG("[%s:%s(%s)]", par, "", "OK");\ @@ -170,7 +170,7 @@ memcpy(&l_lenval, ((inst par) - sizeof(uint16_t)), sizeof(uint16_t));\ if( (l_lenval + 33) >= left ){\ PUTLOG("[%s:%s(%s)]", par, inst par, \ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ PUTLOG("[%s:%s(%s)]", par, "", "OK");\ diff --git a/src/smpp34_pack.c b/src/smpp34_pack.c index 1916172..b36e7a4 100644 --- a/src/smpp34_pack.c +++ b/src/smpp34_pack.c @@ -63,7 +63,7 @@ lenval = sizeof(uint32_t);\ if( lenval >= left ){\ PUTLOG("[%s:%08X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ _str(inst par,dummy_b);\ @@ -81,7 +81,7 @@ lenval = sizeof(uint16_t);\ if( lenval >= left ){\ PUTLOG("[%s:%04X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ _str(inst par,dummy_b);\ @@ -98,7 +98,7 @@ lenval = sizeof(uint8_t);\ if( lenval >= left ){\ PUTLOG("[%s:%02X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ _str(inst par,dummy_b);\ @@ -123,7 +123,7 @@ lenval = strlen((char*)inst par) + 1;\ if( lenval > left ){\ PUTLOG("[len(%s):%d(%s)]", par, lenval, \ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( lenval > sizeval ){\ @@ -143,7 +143,7 @@ lenval = *((inst par) - 1);\ if( lenval >= left ){\ PUTLOG("[leng %s:%d(%s)]", par, lenval,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( lenval >= sizeval ){\ @@ -162,7 +162,7 @@ memcpy(&l_lenval, ((inst par) - sizeof(uint16_t)), sizeof(uint16_t));\ if( l_lenval >= left ){\ PUTLOG("[leng %s:%d(%s)]", par, l_lenval,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( l_lenval > sizeval ){\ diff --git a/src/smpp34_unpack.c b/src/smpp34_unpack.c index e378b0b..f498d01 100644 --- a/src/smpp34_unpack.c +++ b/src/smpp34_unpack.c @@ -60,7 +60,7 @@ lenval = sizeof( uint32_t );\ if( lenval > left ){\ PUTLOG("[%s:%08X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ memcpy(&inst par, aux, lenval);\ @@ -78,7 +78,7 @@ lenval = sizeof( uint16_t );\ if( lenval > left ){\ PUTLOG("[%s:%04X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ }\ memcpy(&inst par, aux, lenval);\ @@ -96,7 +96,7 @@ lenval = sizeof( uint8_t );\ if( lenval > left ){\ PUTLOG("[%s:%02X(%s)]", par, inst par,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ memcpy(&inst par, aux, lenval);\ @@ -129,7 +129,7 @@ lenval = strlen( (char*) aux ) + 1;\ if( lenval > left ){\ PUTLOG("[len(%s):%d(%s)]", par, lenval, \ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( lenval > size ){\ @@ -147,7 +147,7 @@ lenval = *((inst par) - 1);\ if( lenval > left ){\ PUTLOG("[leng %s:%d(%s)]", par, lenval,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( lenval > size ){\ @@ -165,7 +165,7 @@ memcpy(&l_lenval, (inst par - sizeof(uint16_t)), sizeof(uint16_t));\ if( l_lenval > left ){\ PUTLOG("[leng %s:%d(%s)]", par, l_lenval,\ - "Value lenght exceed buffer lenght");\ + "Value length exceed buffer length");\ return( -1 );\ };\ if( l_lenval > size ){\ diff --git a/test_apps/recv_and_unpack.inc b/test_apps/recv_and_unpack.inc index 090ea11..1b85a19 100644 --- a/test_apps/recv_and_unpack.inc +++ b/test_apps/recv_and_unpack.inc @@ -3,7 +3,7 @@ /* Read from socket (This is a sample, must be more complex) **********/ ret = recv(sock_tcp, local_buffer, 4, MSG_PEEK); if( ret != 4 ){ printf("Error in recv(PEEK)\n");return( -1 );}; - memcpy(&tempo, local_buffer, sizeof(uint32_t)); /* get lenght PDU */ + memcpy(&tempo, local_buffer, sizeof(uint32_t)); /* get length PDU */ local_buffer_len = ntohl( tempo ); ret = recv(sock_tcp, local_buffer, local_buffer_len, 0); if( ret != local_buffer_len ){