Peter M. Groen / libmodbus

Commit a022e9a9888d65f399a2f7dad016e02dc543b1d7

Authored by Stéphane Raimbault
1 parent 49d6f4a7

Minor variable renaming (ret_size)

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/modbus-rtu.c
  View file @a022e9a
@@ -817,7 +817,7 @@ modbus_t* modbus_new_rtu(const char *device, @@ -817,7 +817,7 @@ modbus_t* modbus_new_rtu(const char *device,
817 modbus_t *ctx; 817 modbus_t *ctx;
818 modbus_rtu_t *ctx_rtu; 818 modbus_rtu_t *ctx_rtu;
819 size_t dest_size; 819 size_t dest_size;
820 - size_t src_size; 820 + size_t ret_size;
821 821
822 ctx = (modbus_t *) malloc(sizeof(modbus_t)); 822 ctx = (modbus_t *) malloc(sizeof(modbus_t));
823 _modbus_init_common(ctx); 823 _modbus_init_common(ctx);
@@ -827,17 +827,17 @@ modbus_t* modbus_new_rtu(const char *device, @@ -827,17 +827,17 @@ modbus_t* modbus_new_rtu(const char *device,
827 ctx_rtu = (modbus_rtu_t *)ctx->backend_data; 827 ctx_rtu = (modbus_rtu_t *)ctx->backend_data;
828 828
829 dest_size = sizeof(ctx_rtu->device); 829 dest_size = sizeof(ctx_rtu->device);
830 - src_size = strlcpy(ctx_rtu->device, device, dest_size);  
831 - if (src_size == 0) {  
832 - modbus_free(ctx); 830 + ret_size = strlcpy(ctx_rtu->device, device, dest_size);
  831 + if (ret_size == 0) {
833 fprintf(stderr, "The device string is empty\n"); 832 fprintf(stderr, "The device string is empty\n");
  833 + modbus_free(ctx);
834 errno = EINVAL; 834 errno = EINVAL;
835 return NULL; 835 return NULL;
836 } 836 }
837 837
838 - if (src_size >= dest_size) {  
839 - modbus_free(ctx); 838 + if (ret_size >= dest_size) {
840 fprintf(stderr, "The device string has been truncated\n"); 839 fprintf(stderr, "The device string has been truncated\n");
  840 + modbus_free(ctx);
841 errno = EINVAL; 841 errno = EINVAL;
842 return NULL; 842 return NULL;
843 } 843 }