Diff: ParsedRecord.cpp

Revision:

20:505d29d5bdfc

Parent:

11:e1bee9a77652

--- a/ParsedRecord.cpp	Fri Mar 20 14:26:52 2015 +0000
+++ b/ParsedRecord.cpp	Mon Apr 13 14:24:44 2015 +0000
@@ -25,12 +25,13 @@
  * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
 
 #include "ParsedRecord.h"
 #include "ComposedRecord.h"
 #include "ParsedValue.h"
-#include <stdlib.h>
-#include <string.h>
 
 
 /*-------------------------------------------------------------------------*/
@@ -49,7 +50,7 @@
 	clear();
 
 #ifdef SMARTREST_PARSED_DYNAMIC_ALLOC
-	if (_values != NULL)
+	if (_values)
 		free(_values);
 #endif
 }
@@ -77,11 +78,9 @@
 		return NULL;
 
 	const char *ptr = _buffer;
-	for (size_t n = 0; n < index; n++)
-	{
+	for (size_t n = 0; n < index; n++) {
 		ptr += strlen(ptr) + 1;
 	}
-
 	return ptr;
 }
 /*-------------------------------------------------------------------------*/
@@ -99,8 +98,7 @@
 		count = SMARTREST_PARSED_FIXED_SIZE;
 #endif
 
-	if (_copy)
-	{
+	if (_copy) {
 		const char *ptr = buffer;
 		for (size_t n = 0; n < count; n++)
 			ptr += strlen(ptr) + 1;
@@ -108,20 +106,16 @@
 		if (_buffer == NULL)
 			return false;
 		memcpy((char*)_buffer, buffer, ptr-buffer);
-	}
-	else
-	{
+	} else {
 		_buffer = buffer;
 	}
 	_count = count;
 
 	const char *ptr = _buffer;
-	for (size_t n = 0; n < count; n++)
-	{
+	for (size_t n = 0; n < count; n++) {
 		_values[n] = new ParsedValue(ptr, false);
 		ptr += strlen(ptr) + 1;
 	}
-
 	return true;
 }
 /*-------------------------------------------------------------------------*/