[Mt-daapd-cvs] mt-daapd/src flac.c,1.1,1.2

[Ron P. <rp...@us...>]

Update of /cvsroot/mt-daapd/mt-daapd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19205/src

Modified Files:
	flac.c 
Log Message:
make flac.c -Wall clean

Index: flac.c
===================================================================
RCS file: /cvsroot/mt-daapd/mt-daapd/src/flac.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** flac.c	27 Feb 2005 00:42:27 -0000	1.1
--- flac.c	20 Mar 2005 01:27:55 -0000	1.2
***************
*** 40,44 ****
  
  #include "daapd.h"
- #include "db-memory.h"
  #include "err.h"
  #include "mp3-scanner.h"
--- 40,43 ----
***************
*** 52,56 ****
  int scan_get_flacfileinfo(char *filename, MP3FILE *pmp3)
  {
-     FLAC__bool ok;
      FLAC__Metadata_Chain *chain;
      FLAC__Metadata_Iterator *iterator;
--- 51,54 ----
***************
*** 124,128 ****
  int scan_get_flactags(char *filename, MP3FILE *pmp3)
  {
-     FLAC__bool ok;
      FLAC__Metadata_Chain *chain;
      FLAC__Metadata_Iterator *iterator;
--- 122,125 ----
***************
*** 158,199 ****
  	    {
  		for (i = 0; i < block->data.vorbis_comment.num_comments; i++) {
! 		    if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 						 "ARTIST", &len)) {
  			if ((pmp3->artist = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->artist, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"TITLE", &len)) {
  			if ((pmp3->title = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->title, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"ALBUM", &len)) {
  			if ((pmp3->album = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->album, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"GENRE", &len)) {
  			if ((pmp3->genre = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->genre, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"COMPOSER", &len)) {
  			if ((pmp3->composer = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->composer, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"COMMENT", &len)) {
  			if ((pmp3->comment = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->comment, val, len);
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"TRACKNUMBER", &len)) {
  			tmp = *(val + len);
  			*(val + len) = '\0';
  			pmp3->track = atoi(val);
  			*(val + len) = tmp;
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"DISCNUMBER", &len)) {
  			tmp = *(val + len);
  			*(val + len) = '\0';
  			pmp3->disc = atoi(val);
  			*(val + len) = tmp;
! 		    } else if (val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							"YEAR", &len)) {
  			tmp = *(val + len);
  			*(val + len) = '\0';
--- 155,196 ----
  	    {
  		for (i = 0; i < block->data.vorbis_comment.num_comments; i++) {
! 		    if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 						  "ARTIST", &len))) {
  			if ((pmp3->artist = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->artist, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "TITLE", &len))) {
  			if ((pmp3->title = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->title, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "ALBUM", &len))) {
  			if ((pmp3->album = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->album, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "GENRE", &len))) {
  			if ((pmp3->genre = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->genre, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "COMPOSER", &len))) {
  			if ((pmp3->composer = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->composer, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "COMMENT", &len))) {
  			if ((pmp3->comment = calloc(len + 1, 1)) != NULL)
  			    strncpy(pmp3->comment, val, len);
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "TRACKNUMBER", &len))) {
  			tmp = *(val + len);
  			*(val + len) = '\0';
  			pmp3->track = atoi(val);
  			*(val + len) = tmp;
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "DISCNUMBER", &len))) {
  			tmp = *(val + len);
  			*(val + len) = '\0';
  			pmp3->disc = atoi(val);
  			*(val + len) = tmp;
! 		    } else if ((val = GET_VORBIS_COMMENT(block->data.vorbis_comment.comments[i],
! 							 "YEAR", &len))) {
  			tmp = *(val + len);
  			*(val + len) = '\0';