The codec_name_from_id() was added but never used so remove it and eliminate unused function warning

cplay.c:103:20: warning: ‘codec_name_from_id’ defined but not used [-Wunused-function]

We can take from git if user appears

Signed-off-by: Vinod Koul vinod.koul@intel.com --- CC: Katsuhiro Suzuki suzuki.katsuhiro@socionext.com

src/utils/cplay.c | 14 -------------- 1 file changed, 14 deletions(-)

diff --git a/src/utils/cplay.c b/src/utils/cplay.c index 98d71a2199da..b02644a3f2ea 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -100,20 +100,6 @@ static const struct { }; #define CPLAY_NUM_CODEC_IDS (sizeof(codec_ids) / sizeof(codec_ids[0]))

-static const char *codec_name_from_id(unsigned int id) -{ - static char hexname[12]; - int i; - - for (i = 0; i < CPLAY_NUM_CODEC_IDS; ++i) { - if (codec_ids[i].id == id) - return codec_ids[i].name; - } - - snprintf(hexname, sizeof(hexname), "0x%x", id); - return hexname; /* a static is safe because we're single-threaded */ -} - static void usage(void) { int i;

We get a warning in cplay for incorrect print specifier, fix it by using right one %ld for long unsigned int.

cplay.c:327:19: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘long unsigned int’ [-Wformat=] fprintf(stderr, "codec ID %d is not supported\n", codec_id);

Signed-off-by: Vinod Koul vinod.koul@intel.com --- src/utils/cplay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/cplay.c b/src/utils/cplay.c index d2c60f976c6c..ea36b8771caf 100644 --- a/src/utils/cplay.c +++ b/src/utils/cplay.c @@ -324,7 +324,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, get_codec_iec(file, &config, &codec); break; default: - fprintf(stderr, "codec ID %d is not supported\n", codec_id); + fprintf(stderr, "codec ID %ld is not supported\n", codec_id); exit(EXIT_FAILURE); }

On 4/18/18 11:36 PM, Vinod Koul wrote:

The _is_codec_supported() was dead and none using it, so remove this and eliminate unused function warning

compress.c:145:13: warning: ‘_is_codec_supported’ defined but not used [-Wunused-function]

We can take from git if user appears

Signed-off-by: Vinod Koul vinod.koul@intel.com

src/lib/compress.c | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-)

diff --git a/src/lib/compress.c b/src/lib/compress.c index 8ae6bbda7a89..934690e39ed0 100644 --- a/src/lib/compress.c +++ b/src/lib/compress.c @@ -142,49 +142,6 @@ static int get_compress_version(struct compress *compress) return version; }

-static bool _is_codec_supported(struct compress *compress, struct compr_config *config,

• 		const struct snd_compr_caps *caps)
  

-{

• bool codec = false;
• unsigned int i;
• for (i = 0; i < caps->num_codecs; i++) {

• if (caps->codecs[i] == config->codec->id) {
  

• 	/* found the codec */
  

• 	codec = true;
  

• 	break;
  

• }
  

• }
• if (codec == false) {

• oops(compress, ENXIO, "this codec is not supported");
  

• return false;
  

• }
• if (config->fragment_size < caps->min_fragment_size) {

• oops(compress, EINVAL, "requested fragment size %d is below min supported %d",
  

• 	config->fragment_size, caps->min_fragment_size);
  

• return false;
  

• }
• if (config->fragment_size > caps->max_fragment_size) {

• oops(compress, EINVAL, "requested fragment size %d is above max supported %d",
  

• 	config->fragment_size, caps->max_fragment_size);
  

• return false;
  

• }
• if (config->fragments < caps->min_fragments) {

• oops(compress, EINVAL, "requested fragments %d are below min supported %d",
  

• 	config->fragments, caps->min_fragments);
  

• return false;
  

• }
• if (config->fragments > caps->max_fragments) {

• oops(compress, EINVAL, "requested fragments %d are above max supported %d",
  

• 	config->fragments, caps->max_fragments);
  

• return false;
  

• }
• /* TODO: match the codec properties */
• return true;

-}

• static bool _is_codec_type_supported(int fd, struct snd_codec *codec) { struct snd_compr_caps caps;

@@ -271,16 +228,6 @@ struct compress *compress_open(unsigned int card, unsigned int device, config->fragments = caps.max_fragments; }

-#if 0

• /* FIXME need to turn this On when DSP supports

• * and treat in no support case
  

• */
  

• if (_is_codec_supported(compress, config, &caps) == false) {

• oops(compress, errno, "codec not supported\n");
  

• goto codec_fail;
  

• }

-#endif

Why was this commented out in the first place?

This seems like a valid check to me. If the application is asking for a codec that isn't supported by hardware, should it be allowed to proceed?

• memcpy(compress->config, config, sizeof(*compress->config)); fill_compress_params(config, &params);