Changed to reflect standard TinyOS coding style

[tinyos-2.x.git] / apps / tutorials / PacketParrot / PacketParrotP.nc

diff --git a/apps/tutorials/PacketParrot/PacketParrotP.nc b/apps/tutorials/PacketParrot/PacketParrotP.nc
index 7281643fe9161c2293f4ec6497c46587d89304a2..3b27d99ad2de26bf95b421f9b2e94c967d7b6816 100644 (file)
--- a/apps/tutorials/PacketParrot/PacketParrotP.nc
+++ b/apps/tutorials/PacketParrot/PacketParrotP.nc
@@ -64,10 +64,9 @@ implementation {
 
   event void AMControl.startDone(error_t err) {
     if (err == SUCCESS) {
-      error_t e;
-      do {
-        e = call LogRead.read(&m_entry, sizeof(logentry_t));
-      } while (e != SUCCESS);
+      if (call LogRead.read(&m_entry, sizeof(logentry_t)) != SUCCESS) {
+       // Handle error.
+      }
     }
     else {
       call AMControl.start();
@@ -85,10 +84,9 @@ implementation {
       call Leds.led1On();
     }
     else {
-      error_t e;
-      do {
-       e = call LogWrite.erase();
-      } while (e != SUCCESS);
+      if (call LogWrite.erase() != SUCCESS) {
+       // Handle error.
+      }
       call Leds.led0On();
     }
   }
@@ -97,11 +95,10 @@ implementation {
   event void Send.sendDone(message_t* msg, error_t err) {
     call Leds.led1Off();
     if ( (err == SUCCESS) && (msg == &m_entry.msg) ) {
-      error_t e;
       call Packet.clear(&m_entry.msg);
-      do {
-        e = call LogRead.read(&m_entry, sizeof(logentry_t));
-      } while (e != SUCCESS);
+      if (call LogRead.read(&m_entry, sizeof(logentry_t)) != SUCCESS) {
+       // Handle error.
+      }
     }
     else {
       call Timer0.startOneShot(INTER_PACKET_INTERVAL);
@@ -131,7 +128,7 @@ implementation {
       m_busy = TRUE;
       m_entry.len = len;
       m_entry.msg = *msg;
-      if (call LogWrite.append(&m_entry, sizeof(message_t)) != SUCCESS) {
+      if (call LogWrite.append(&m_entry, sizeof(logentry_t)) != SUCCESS) {
        m_busy = FALSE;
       }
     }