image/* Wrong sizeof.

mmc: remove some deprecated things.
This commit is contained in:
rocky
2006-02-13 11:00:53 +00:00
parent 695091068b
commit da74e72b38
4 changed files with 11 additions and 11 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: bincue.c,v 1.18 2006/02/13 01:43:29 rocky Exp $
$Id: bincue.c,v 1.19 2006/02/13 11:00:53 rocky Exp $
Copyright (C) 2002, 2003, 2004, 2005, 2006
Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: bincue.c,v 1.18 2006/02/13 01:43:29 rocky Exp $";
static const char _rcsid[] = "$Id: bincue.c,v 1.19 2006/02/13 11:00:53 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -955,7 +955,7 @@ static bool
get_hwinfo_bincue ( const CdIo_t *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strncpy(hw_info->psz_vendor, "libcdio",
sizeof(hw_info->psz_model)-1);
sizeof(hw_info->psz_vendor)-1);
hw_info->psz_vendor[sizeof(hw_info->psz_vendor)-1] = '\0';
strncpy(hw_info->psz_model, "CDRWIN",
sizeof(hw_info->psz_model)-1);

View File

@@ -1,5 +1,5 @@
/*
$Id: cdrdao.c,v 1.19 2006/02/13 01:43:29 rocky Exp $
$Id: cdrdao.c,v 1.20 2006/02/13 11:00:53 rocky Exp $
Copyright (C) 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
toc reading routine adapted from cuetools
@@ -25,7 +25,7 @@
(*.cue).
*/
static const char _rcsid[] = "$Id: cdrdao.c,v 1.19 2006/02/13 01:43:29 rocky Exp $";
static const char _rcsid[] = "$Id: cdrdao.c,v 1.20 2006/02/13 11:00:53 rocky Exp $";
#include "image.h"
#include "cdio_assert.h"
@@ -1145,7 +1145,7 @@ static bool
get_hwinfo_cdrdao ( const CdIo_t *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strncpy(hw_info->psz_vendor, "libcdio",
sizeof(hw_info->psz_model)-1);
sizeof(hw_info->psz_vendor)-1);
hw_info->psz_vendor[sizeof(hw_info->psz_vendor)-1] = '\0';
strncpy(hw_info->psz_model, "cdrdao",
sizeof(hw_info->psz_model)-1);

View File

@@ -1,5 +1,5 @@
/*
$Id: nrg.c,v 1.22 2006/02/13 01:43:29 rocky Exp $
$Id: nrg.c,v 1.23 2006/02/13 11:00:53 rocky Exp $
Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -46,7 +46,7 @@
#include "_cdio_stdio.h"
#include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.22 2006/02/13 01:43:29 rocky Exp $";
static const char _rcsid[] = "$Id: nrg.c,v 1.23 2006/02/13 11:00:53 rocky Exp $";
nero_id_t nero_id;
nero_dtype_t nero_dtype;
@@ -1114,7 +1114,7 @@ static bool
get_hwinfo_nrg ( const CdIo *p_cdio, /*out*/ cdio_hwinfo_t *hw_info)
{
strncpy(hw_info->psz_vendor, "libcdio",
sizeof(hw_info->psz_model)-1);
sizeof(hw_info->psz_vendor)-1);
hw_info->psz_vendor[sizeof(hw_info->psz_vendor)-1] = '\0';
strncpy(hw_info->psz_model, "Nero",
sizeof(hw_info->psz_model)-1);

View File

@@ -1,8 +1,8 @@
/* Common Multimedia Command (MMC) routines.
$Id: mmc.c,v 1.29 2005/10/21 11:27:09 rocky Exp $
$Id: mmc.c,v 1.30 2006/02/13 11:00:53 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by