From 6166553755dfee1bfb509d17a83050c21e9826e7 Mon Sep 17 00:00:00 2001
From: Jakob Skov-Pedersen <jasp@keepfocus.dk>
Date: Sun, 17 Mar 2013 09:15:43 +0100
Subject: [PATCH] Make my last change more readable.

As suggested by lategoodbye. Also make it more in line with the way
everything else is written.
---
 mbus/mbus-protocol.c | 5 +++--
 mbus/mbus-protocol.h | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mbus/mbus-protocol.c b/mbus/mbus-protocol.c
index b0c537d..88cf474 100755
--- a/mbus/mbus-protocol.c
+++ b/mbus/mbus-protocol.c
@@ -2678,10 +2678,11 @@ mbus_data_variable_parse(mbus_frame *frame, mbus_data_variable *data)
         while (i < frame->data_size)
         {
             // Skip filler dif=2F
-            while (((frame->data[i] & 0xFF) == 0x2F) && (i < frame->data_size)) {
+            if ((frame->data[i] & 0xFF) == MBUS_DIB_DIF_IDLE_FILLER)
+            {
               i++;
+              continue;
             }
-            if (i == frame->data_size) break;
 
             if ((record = mbus_data_record_new()) == NULL)
             {
diff --git a/mbus/mbus-protocol.h b/mbus/mbus-protocol.h
index ac5069b..1263417 100755
--- a/mbus/mbus-protocol.h
+++ b/mbus/mbus-protocol.h
@@ -129,6 +129,7 @@ typedef struct _mbus_slave_data {
 #define MBUS_DIB_VIF_EXTENSION_BIT         0x80
 #define MBUS_DIB_DIF_MANUFACTURER_SPECIFIC 0x0F
 #define MBUS_DIB_DIF_MORE_RECORDS_FOLLOW   0x1F
+#define MBUS_DIB_DIF_IDLE_FILLER           0x2F
 
 
 typedef struct _mbus_data_information_block {