[SFrame-V3] libsframe: remove old sframe_decoder_get_funcdesc API

sframe_decoder_get_funcdesc () was added for SFRAME_VERSION_1.  This has
since been obsoleted by introduction of SFRAME_VERSION_2 and its
corresponding sframe_decoder_get_funcdesc_v2 API.

Remove from the version script file as well.  We will bump the version
of the library to 3.0.0 in a subsequent patch (closer to release) and
consolidate the entries into a new LIBSFRAME_3.0 node.

include/
        * sframe-api.h (sframe_decoder_get_funcdesc): Remove.
libsframe/
        * libsframe.ver: Likewise.
        * sframe.c (sframe_decoder_get_funcdesc): Remove definition.

diff --git a/include/sframe-api.h b/include/sframe-api.h
index ed2e10a4b3caa008d8b5b4da78e7d9329ee65ead..6afb615f144796443bbb0675b2a5df53f92ccdfe 100644 (file)
--- a/include/sframe-api.h
+++ b/include/sframe-api.h
@@ -169,17 +169,6 @@ sframe_decoder_get_fre (sframe_decoder_ctx *ctx,
                        unsigned int fre_idx,
                        sframe_frame_row_entry *fre);
 
-/* Get the data (NUM_FRES, FUNC_START_ADDRESS) from the function
-   descriptor entry at index I'th in the decoder CTX.  If failed,
-   return error code.  */
-extern int
-sframe_decoder_get_funcdesc (sframe_decoder_ctx *ctx,
-                            unsigned int i,
-                            uint32_t *num_fres,
-                            uint32_t *func_size,
-                            int32_t *func_start_address,
-                            unsigned char *func_info);
-
 /* Get the data (NUM_FRES, FUNC_SIZE, FUNC_START_ADDRESS, FUNC_INFO,
    REP_BLOCK_SIZE) from the function descriptor entry at index I'th
    in the decoder CTX.  If failed, return error code.

diff --git a/libsframe/libsframe.ver b/libsframe/libsframe.ver
index 4286a72b93bce970954e11dbc96b4af9a4595d0f..15a5de4725d87fd734bd90d099a9dde4c8505335 100644 (file)
--- a/libsframe/libsframe.ver
+++ b/libsframe/libsframe.ver
@@ -20,7 +20,6 @@ LIBSFRAME_2.0 {
     sframe_decoder_get_fixed_ra_offset;
     sframe_find_fre;
     sframe_decoder_get_num_fidx;
-    sframe_decoder_get_funcdesc;
     sframe_decoder_get_funcdesc_v2;
     sframe_decoder_get_fre;
     sframe_encode;

diff --git a/libsframe/sframe.c b/libsframe/sframe.c
index d8586ea95635e63936e555f0d6cf1b3db613d1e2..41cb275bef2f1a97d6bc0570696633bcc6f1833b 100644 (file)
--- a/libsframe/sframe.c
+++ b/libsframe/sframe.c
@@ -1444,40 +1444,6 @@ sframe_decoder_get_num_fidx (sframe_decoder_ctx *ctx)
   return num_fdes;
 }
 
-/* Get the data (NUM_FRES, FUNC_START_ADDRESS) from the function
-   descriptor entry at index I'th in the decoder CTX.  If failed,
-   return error code.  */
-/* FIXME - consolidate the args and return a
-   sframe_func_desc_index_elem rather?  */
-
-int
-sframe_decoder_get_funcdesc (sframe_decoder_ctx *ctx,
-                            unsigned int i,
-                            uint32_t *num_fres,
-                            uint32_t *func_size,
-                            int32_t *func_start_address,
-                            unsigned char *func_info)
-{
-  sframe_func_desc_entry_int *fdp;
-  int err = 0;
-
-  if (ctx == NULL || func_start_address == NULL || num_fres == NULL
-      || func_size == NULL)
-    return sframe_set_errno (&err, SFRAME_ERR_INVAL);
-
-  fdp = sframe_decoder_get_funcdesc_at_index (ctx, i);
-
-  if (fdp == NULL)
-    return sframe_set_errno (&err, SFRAME_ERR_FDE_NOTFOUND);
-
-  *num_fres = fdp->func_num_fres;
-  *func_start_address = fdp->func_start_addr;
-  *func_size = fdp->func_size;
-  *func_info = fdp->func_info;
-
-  return 0;
-}
-
 int
 sframe_decoder_get_funcdesc_v2 (sframe_decoder_ctx *dctx,
                                unsigned int i,