Correct ftdi_eeprom_free()

[libftdi] / src / ftdi.c

diff --git a/src/ftdi.c b/src/ftdi.c
index 139bbd9..2a39a45 100644 (file)
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2223,25 +2223,24 @@ void ftdi_eeprom_initdefaults(struct ftdi_context *ftdi)
 */
 void ftdi_eeprom_free(struct ftdi_context *ftdi)
 {
-    struct ftdi_eeprom *eeprom;
     if (!ftdi)
         return;
     if (ftdi->eeprom)
-        return;
-
-    eeprom = ftdi->eeprom;
+    {
+        struct ftdi_eeprom *eeprom = ftdi->eeprom;
 
-    if (eeprom->manufacturer != 0) {
-        free(eeprom->manufacturer);
-        eeprom->manufacturer = 0;
-    }
-    if (eeprom->product != 0) {
-        free(eeprom->product);
-        eeprom->product = 0;
-    }
-    if (eeprom->serial != 0) {
-        free(eeprom->serial);
-        eeprom->serial = 0;
+        if (eeprom->manufacturer != 0) {
+            free(eeprom->manufacturer);
+            eeprom->manufacturer = 0;
+        }
+        if (eeprom->product != 0) {
+            free(eeprom->product);
+            eeprom->product = 0;
+        }
+        if (eeprom->serial != 0) {
+            free(eeprom->serial);
+            eeprom->serial = 0;
+        }
     }
 }
 
@@ -2270,9 +2269,9 @@ int ftdi_eeprom_build(struct ftdi_context *ftdi, unsigned char *output)
     struct ftdi_eeprom *eeprom;
 
     if (ftdi == NULL)
-        return -2;
+        ftdi_error_return(-2,"No context");
     if (ftdi->eeprom == NULL)
-        return -2;
+        ftdi_error_return(-2,"No eeprom structure");
 
     eeprom= ftdi->eeprom;
 
@@ -2498,9 +2497,9 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, unsigned char *buf, int size)
     struct ftdi_eeprom *eeprom;
 
     if (ftdi == NULL)
-        return -1;
+        ftdi_error_return(-1,"No context");
     if (ftdi->eeprom == NULL)
-        return -1;
+        ftdi_error_return(-1,"No eeprom");
 
     eeprom = ftdi->eeprom;
 #if 0
@@ -2518,7 +2517,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, unsigned char *buf, int size)
 
     // eeprom size exceeded?
     if (size_check < 0)
-        return (-1);
+        ftdi_error_return(-1,"Size check failed");
 #endif
 
     // empty eeprom struct
@@ -2661,7 +2660,7 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, unsigned char *buf, int size)
     if (eeprom_checksum != checksum)
     {
         fprintf(stderr, "Checksum Error: %04x %04x\n", checksum, eeprom_checksum);
-        return -1;
+        ftdi_error_return(-1,"EEPROM checksum error");
     }
 
     return 0;