From d00df50fcf7e7a46536fd496c42522cb617d217b Mon Sep 17 00:00:00 2001 From: Shenhao Wang Date: Fri, 24 Jul 2020 15:39:42 +0800 Subject: [PATCH] Fix ECPGt_bytea typo Using struct ECPGgeneric_bytea when type is ECPGt_bytea --- src/interfaces/ecpg/ecpglib/data.c | 4 ++-- src/interfaces/ecpg/ecpglib/descriptor.c | 4 ++-- src/interfaces/ecpg/ecpglib/execute.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index d3db5094cf..6bc91ef7eb 100644 --- a/src/interfaces/ecpg/ecpglib/data.c +++ b/src/interfaces/ecpg/ecpglib/data.c @@ -523,8 +523,8 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno, case ECPGt_bytea: { - struct ECPGgeneric_varchar *variable = - (struct ECPGgeneric_varchar *) (var + offset * act_tuple); + struct ECPGgeneric_bytea *variable = + (struct ECPGgeneric_bytea *) (var + offset * act_tuple); long dst_size, src_size, dec_size; diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index f71f539bef..369c2f0867 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -591,8 +591,8 @@ set_desc_attr(struct descriptor_item *desc_item, struct variable *var, else { - struct ECPGgeneric_varchar *variable = - (struct ECPGgeneric_varchar *) (var->value); + struct ECPGgeneric_bytea *variable = + (struct ECPGgeneric_bytea *) (var->value); desc_item->is_binary = true; desc_item->data_len = variable->len; diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index 6961d7c75b..9d61ae7250 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -822,8 +822,8 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari case ECPGt_bytea: { - struct ECPGgeneric_varchar *variable = - (struct ECPGgeneric_varchar *) (var->value); + struct ECPGgeneric_bytea *variable = + (struct ECPGgeneric_bytea *) (var->value); if (!(mallocedval = (char *) ecpg_alloc(variable->len, lineno))) return false; @@ -1401,7 +1401,7 @@ ecpg_build_params(struct statement *stmt) if (var->type == ECPGt_bytea) { - binary_length = ((struct ECPGgeneric_varchar *) (var->value))->len; + binary_length = ((struct ECPGgeneric_bytea *) (var->value))->len; binary_format = true; } } -- 2.21.0