← Back to branch summary

~ubuntu-branches/ubuntu/saucy/flac/saucy-proposed

« back to all changes in this revision

Viewing changes to src/plugin_xmms/plugin.c

  • Committer: Package Import Robot
  • Author(s): Fabian Greffrath
  • Date: 2013-06-07 10:24:30 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20130607102430-x7e7zt462c0tuetp
Tags: 1.3.0-1
http://bugs.debian.org/527542
http://bugs.debian.org/705601
http://bugs.debian.org/710062
* Imported Upstream version 1.3.0 (Closes: #527542, #705601).
* Update debian/watch file, thanks Ulrich Klauer (Closes: #710062).
* Revert "Remove manpages from master branch."
* Imported Upstream version 1.3.0
* Convert package to "3.0 (quilt)" source format.
* Remove all patches, they have either been merged upstream or do not
  apply anymore (tested).
* Explicitly enable static libraries.
* Simplify debian/libflac-doc.install.
* Bump shlibs for added symbols.
* Remove needless Build-Depends: libid3-3.8.3-dev.
* Update Homepage field.
* Repair upstream manpage regeneration rule.
* Bump Build-Depends: debhelper (>= 9).
* Fix vcs-field-not-canonical.
* Import two patches from upstream GIT:
  + Add missing config.h includes.
  + Fix local_strcat() to terminate string correctly.
* Disable 3DNow! optimizations, enable SSE only on amd64, enable Altivec
  only on ppc64, disable ASM optimizations elsewhere.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugin_xmms/plugin.c
1
1
/* libxmms-flac - XMMS FLAC input plugin
2
 
 * Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007  Josh Coalson
 
2
 * Copyright (C) 2000-2009  Josh Coalson
 
3
 * Copyright (C) 2011-2013  Xiph.Org Foundation
3
4
 *
4
5
 * This program is free software; you can redistribute it and/or
5
6
 * modify it under the terms of the GNU General Public License
11
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
13
 * GNU General Public License for more details.
13
14
 *
14
 
 * You should have received a copy of the GNU General Public License
15
 
 * along with this program; if not, write to the Free Software
16
 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
15
 * You should have received a copy of the GNU General Public License along
 
16
 * with this program; if not, write to the Free Software Foundation, Inc.,
 
17
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17
18
 */
18
19
 
19
 
#if HAVE_CONFIG_H
20
 
#  include <config.h>
 
20
#ifdef HAVE_CONFIG_H
 
21
#include "config.h"
21
22
#endif
22
23
 
 
24
#include "plugin.h"
 
25
 
23
26
#include <limits.h>
24
27
#include <pthread.h>
25
28
#include <stdlib.h>
404
407
                                        *title = NULL;
405
408
                                }
406
409
                                else {
407
 
                                        *title = g_malloc(strlen(errtitle) + 1 + strlen(filename) + 1 + 1);
408
 
                                        sprintf(*title, "%s\"%s\"", errtitle, filename);
 
410
                                        size_t len = strlen(errtitle) + 1 + strlen(filename) + 1 + 1;
 
411
                                        *title = g_malloc(len);
 
412
                                        flac_snprintf(*title, len, "%s\"%s\"", errtitle, filename);
409
413
                                }
410
414
                        } else {
411
415
                                *title = NULL;