storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use an asprintf wrapper, to report errors and NULLify the result.

Browse Source
This commit is contained in:
Justin Maggard
2012-03-14 17:57:21 +00:00
parent c9d979886b
commit cabbd0b1de
10 changed files with 77 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tagutils/tagutils-aac.c
View File

@ -407,11 +407,11 @@ bad_esds:
}
/* AAC @ Level 1/2 */
if( psong->channels <= 2 && psong->bitrate <= 320000 )
asprintf(&(psong->dlna_pn), "AAC_ISO_320");
xasprintf(&(psong->dlna_pn), "AAC_ISO_320");
else if( psong->channels <= 2 && psong->bitrate <= 576000 )
asprintf(&(psong->dlna_pn), "AAC_ISO");
xasprintf(&(psong->dlna_pn), "AAC_ISO");
else if( psong->channels <= 6 && psong->bitrate <= 1440000 )
asprintf(&(psong->dlna_pn), "AAC_MULT5_ISO");
xasprintf(&(psong->dlna_pn), "AAC_MULT5_ISO");
else
DPRINTF(E_DEBUG, L_METADATA, "Unhandled AAC: %d channels, %d bitrate\n",
psong->channels, psong->bitrate);

8
tagutils/tagutils-asf.c
View File

@ -47,15 +47,15 @@ _pick_dlna_profile(struct song_metadata *psong, uint16_t format)
{
case WMA:
if( psong->max_bitrate < 193000 )
asprintf(&(psong->dlna_pn), "WMABASE");
xasprintf(&(psong->dlna_pn), "WMABASE");
else if( psong->max_bitrate < 385000 )
asprintf(&(psong->dlna_pn), "WMAFULL");
xasprintf(&(psong->dlna_pn), "WMAFULL");
break;
case WMAPRO:
asprintf(&(psong->dlna_pn), "WMAPRO");
xasprintf(&(psong->dlna_pn), "WMAPRO");
break;
case WMALSL:
asprintf(&(psong->dlna_pn), "WMALSL%s",
xasprintf(&(psong->dlna_pn), "WMALSL%s",
psong->channels > 2 ? "_MULT5" : "");
default:
break;

2
tagutils/tagutils-mp3.c
View File

@ -770,7 +770,7 @@ _get_mp3fileinfo(char *file, struct song_metadata *psong)
//DEBUG DPRINTF(E_INFO, L_SCANNER, "Got fileinfo successfully for file=%s song_length=%d\n", file, psong->song_length);
psong->blockalignment = 1;
asprintf(&(psong->dlna_pn), "MP3");
xasprintf(&(psong->dlna_pn), "MP3");
return 0;
}

4
tagutils/tagutils-pcm.c
View File

@ -42,8 +42,8 @@ _get_pcmfileinfo(char *filename, struct song_metadata *psong)
psong->song_length = (sec * 1000) + ms;
psong->lossless = 1;
asprintf(&(psong->mime), "audio/L16;rate=%d;channels=%d", psong->samplerate, psong->channels);
asprintf(&(psong->dlna_pn), "LPCM");
xasprintf(&(psong->mime), "audio/L16;rate=%d;channels=%d", psong->samplerate, psong->channels);
xasprintf(&(psong->dlna_pn), "LPCM");
return 0;
}

1
tagutils/tagutils.c
View File

@ -46,6 +46,7 @@
#include "misc.h"
#include "textutils.h"
#include "../metadata.h"
#include "../utils.h"
#include "../log.h"
struct id3header {