From 25792565350537f76fd92fe5ba03df5dd5e31dae Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Wed, 3 Jun 2020 15:28:43 +0200 Subject: [PATCH] Drop unused parameter from ddsi_plist_quickscan Signed-off-by: Erik Boasson --- src/core/ddsi/include/dds/ddsi/ddsi_plist.h | 4 +--- src/core/ddsi/src/ddsi_plist.c | 3 +-- src/core/ddsi/src/q_receive.c | 12 ++++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/core/ddsi/include/dds/ddsi/ddsi_plist.h b/src/core/ddsi/include/dds/ddsi/ddsi_plist.h index 3f8c283..d1deae3 100644 --- a/src/core/ddsi/include/dds/ddsi/ddsi_plist.h +++ b/src/core/ddsi/include/dds/ddsi/ddsi_plist.h @@ -306,11 +306,9 @@ DDS_EXPORT void ddsi_plist_delta (uint64_t *pdelta, uint64_t *qdelta, const ddsi DDS_EXPORT void ddsi_plist_log (uint32_t cat, const struct ddsrt_log_cfg *logcfg, const ddsi_plist_t *plist); DDS_EXPORT size_t ddsi_plist_print (char * __restrict buf, size_t bufsize, const ddsi_plist_t *plist); -struct nn_rmsg; struct nn_rsample_info; -struct nn_rdata; -DDS_EXPORT unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const struct nn_rmsg *rmsg, const ddsi_plist_src_t *src); +DDS_EXPORT unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const ddsi_plist_src_t *src); DDS_EXPORT dds_return_t ddsi_plist_findparam_checking (const void *buf, size_t bufsz, uint16_t encoding, nn_parameterid_t needle, void **needlep, size_t *needlesz); #if defined (__cplusplus) diff --git a/src/core/ddsi/src/ddsi_plist.c b/src/core/ddsi/src/ddsi_plist.c index c1c491b..c443b0d 100644 --- a/src/core/ddsi/src/ddsi_plist.c +++ b/src/core/ddsi/src/ddsi_plist.c @@ -2923,13 +2923,12 @@ dds_return_t ddsi_plist_findparam_checking (const void *buf, size_t bufsz, uint1 return DDS_RETCODE_BAD_PARAMETER; } -unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const struct nn_rmsg *rmsg, const ddsi_plist_src_t *src) +unsigned char *ddsi_plist_quickscan (struct nn_rsample_info *dest, const ddsi_plist_src_t *src) { /* Sets a few fields in dest, returns address of first byte following parameter list, or NULL on error. Most errors will go undetected, unlike ddsi_plist_init_frommsg(). */ const unsigned char *pl; - (void)rmsg; dest->statusinfo = 0; dest->complex_qos = 0; switch (src->encoding) diff --git a/src/core/ddsi/src/q_receive.c b/src/core/ddsi/src/q_receive.c index f85403c..7b6e53e 100644 --- a/src/core/ddsi/src/q_receive.c +++ b/src/core/ddsi/src/q_receive.c @@ -312,7 +312,7 @@ static int set_sampleinfo_bswap (struct nn_rsample_info *sampleinfo, struct CDRH return 1; } -static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, Data_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp, uint32_t *payloadsz) +static int valid_Data (const struct receiver_state *rst, Data_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp, uint32_t *payloadsz) { /* on success: sampleinfo->{seq,rst,statusinfo,bswap,complex_qos} all set */ ddsi_guid_t pwr_guid; @@ -373,7 +373,7 @@ static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, D src.factory = NULL; src.logconfig = &rst->gv->logconfig; /* just a quick scan, gathering only what we _really_ need */ - if ((ptr = ddsi_plist_quickscan (sampleinfo, rmsg, &src)) == NULL) + if ((ptr = ddsi_plist_quickscan (sampleinfo, &src)) == NULL) return 0; } else @@ -403,7 +403,7 @@ static int valid_Data (const struct receiver_state *rst, struct nn_rmsg *rmsg, D return 1; } -static int valid_DataFrag (const struct receiver_state *rst, struct nn_rmsg *rmsg, DataFrag_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp, uint32_t *payloadsz) +static int valid_DataFrag (const struct receiver_state *rst, DataFrag_t *msg, size_t size, int byteswap, struct nn_rsample_info *sampleinfo, unsigned char **payloadp, uint32_t *payloadsz) { ddsi_guid_t pwr_guid; unsigned char *ptr; @@ -475,7 +475,7 @@ static int valid_DataFrag (const struct receiver_state *rst, struct nn_rmsg *rms src.factory = NULL; src.logconfig = &rst->gv->logconfig; /* just a quick scan, gathering only what we _really_ need */ - if ((ptr = ddsi_plist_quickscan (sampleinfo, rmsg, &src)) == NULL) + if ((ptr = ddsi_plist_quickscan (sampleinfo, &src)) == NULL) return 0; } else @@ -2961,7 +2961,7 @@ static int handle_submsg_sequence unsigned char *datap; size_t submsg_len = submsg_size; /* valid_DataFrag does not validate the payload */ - if (!valid_DataFrag (rst, rmsg, &sm->datafrag, submsg_size, byteswap, &sampleinfo, &datap, &datasz)) + if (!valid_DataFrag (rst, &sm->datafrag, submsg_size, byteswap, &sampleinfo, &datap, &datasz)) goto malformed; /* This only decodes the payload when needed (possibly reducing the submsg size). */ if (!decode_DataFrag (rst->gv, &sampleinfo, datap, datasz, &submsg_len)) @@ -2986,7 +2986,7 @@ static int handle_submsg_sequence uint32_t datasz = 0; size_t submsg_len = submsg_size; /* valid_Data does not validate the payload */ - if (!valid_Data (rst, rmsg, &sm->data, submsg_size, byteswap, &sampleinfo, &datap, &datasz)) + if (!valid_Data (rst, &sm->data, submsg_size, byteswap, &sampleinfo, &datap, &datasz)) goto malformed; /* This only decodes the payload when needed (possibly reducing the submsg size). */ if (!decode_Data (rst->gv, &sampleinfo, datap, datasz, &submsg_len))