Diff: modem_callbacks.cpp

Revision:

2:992b87360140

Parent:

1:f4a7a48a5f2b

Child:

4:999305b576c0

--- a/modem_callbacks.cpp	Thu May 11 15:25:55 2017 +0000
+++ b/modem_callbacks.cpp	Thu May 11 16:51:37 2017 +0000
@@ -15,31 +15,21 @@
 // ============================================================{{{
 void my_read(u8 fid, u32 offset, u32 length, int id)
 {
-    u8 data[256]; // XXX VLA
+    u8 data[256];
     
     if (ram_fs_read(fid, offset, length, data))
     {
-        // Error
-        length = 0;
+        modem_respond(0, ALP_ERR_FILE_NOT_FOUND, id);
     }
-    
-    modem_respond_read(fid, data, offset, length, id);
+    else
+    {
+        modem_respond_read(fid, data, offset, length, id);
+    }
 }
 
 void my_write(u8 fid, void *data, u32 offset, u32 length, int id)
 {
-    alp_errors_t err;
-    
-    if (ram_fs_write(fid, offset, length, (uint8_t*)data))
-    {
-        err = ALP_ERR_FILE_NOT_FOUND;
-    }
-    else
-    {
-        err = ALP_ERR_NONE;
-    }
-    
-    modem_respond(0, err, id);
+    modem_respond(0, (ram_fs_write(fid, offset, length, (uint8_t*)data))? ALP_ERR_FILE_NOT_FOUND : ALP_ERR_NONE, id);
 }
 
 void my_read_fprop(u8 fid, int id)
@@ -64,11 +54,7 @@
 
 void my_delete(u8 fid, int id)
 {
-    alp_errors_t err;
-    
-    err = (ram_fs_delete(fid))? ALP_ERR_FILE_NOT_FOUND : ALP_ERR_NONE;
-    
-    modem_respond(0, err, id);
+    modem_respond(0, (ram_fs_delete(fid))? ALP_ERR_FILE_NOT_FOUND : ALP_ERR_NONE, id);
 }
 
 void my_lqual(u8 ifid, int per)