i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

echo driver: replace strncpy by strlcpy

Browse Source 
using strncpy could possibly lead to a non null terminated string.
also some coding style fix.

CID 2216.
This commit is contained in:
Philippe Saint-Pierre
2012-01-01 19:42:16 -05:00
parent 12892428fc
commit e480c1b658
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/echo/echo.cpp
+15 -9
View File
@@ -110,6 +110,7 @@ echo_mem_new(echo_dev *card, size_t size)
return mem; return mem;
} }
void void
echo_mem_delete(echo_mem *mem) echo_mem_delete(echo_mem *mem)
{ {
@@ -118,6 +119,7 @@ echo_mem_delete(echo_mem *mem)
free(mem); free(mem);
} }
echo_mem * echo_mem *
echo_mem_alloc(echo_dev *card, size_t size) echo_mem_alloc(echo_dev *card, size_t size)
{ {
@@ -132,6 +134,7 @@ echo_mem_alloc(echo_dev *card, size_t size)
return mem; return mem;
} }
void void
echo_mem_free(echo_dev *card, void *ptr) echo_mem_free(echo_dev *card, void *ptr)
{ {
@@ -248,7 +251,8 @@ echo_stream_set_audioparms(echo_stream *stream, uint8 channels,
sample_size = stream->bitsPerSample / 8; sample_size = stream->bitsPerSample / 8;
frame_size = sample_size * stream->channels; frame_size = sample_size * stream->channels;
stream->buffer = echo_mem_alloc(stream->card, stream->bufframes * frame_size * stream->bufcount); stream->buffer = echo_mem_alloc(stream->card,
stream->bufframes * frame_size * stream->bufcount);
stream->trigblk = 1; stream->trigblk = 1;
stream->blkmod = stream->bufcount; stream->blkmod = stream->bufcount;
@@ -322,6 +326,7 @@ echo_stream_start(echo_stream *stream, void (*inth) (void *), void *inthparam)
} }
} }
void void
echo_stream_halt(echo_stream *stream) echo_stream_halt(echo_stream *stream)
{ {
@@ -336,6 +341,7 @@ echo_stream_halt(echo_stream *stream)
} }
} }
echo_stream * echo_stream *
echo_stream_new(echo_dev *card, uint8 use, uint32 bufframes, uint8 bufcount) echo_stream_new(echo_dev *card, uint8 use, uint32 bufframes, uint8 bufcount)
{ {
@@ -375,6 +381,7 @@ echo_stream_new(echo_dev *card, uint8 use, uint32 bufframes, uint8 bufcount)
return stream; return stream;
} }
void void
echo_stream_delete(echo_stream *stream) echo_stream_delete(echo_stream *stream)
{ {
@@ -464,7 +471,7 @@ init_hardware(void)
#ifdef CARDBUS #ifdef CARDBUS
return B_OK; return B_OK;
#else #else
int ix=0; int ix = 0;
pci_info info; pci_info info;
status_t err = ENODEV; status_t err = ENODEV;
@@ -545,7 +552,7 @@ init_driver(void)
LIST_INIT(&(devices)); LIST_INIT(&(devices));
return B_OK; return B_OK;
#else #else
int ix=0; int ix = 0;
pci_info info; pci_info info;
status_t err; status_t err;
@@ -601,7 +608,7 @@ init_driver(void)
} }
#endif #endif
if (echo_setup(&cards[num_cards])) { if (echo_setup(&cards[num_cards])) {
PRINT(("Setup of "DRIVER_NAME" %ld failed\n", num_cards+1)); PRINT(("Setup of "DRIVER_NAME" %ld failed\n", num_cards + 1));
#ifdef __HAIKU__ #ifdef __HAIKU__
(*pci->unreserve_device)(info.bus, info.device, info.function, (*pci->unreserve_device)(info.bus, info.device, info.function,
DRIVER_NAME, &cards[num_cards]); DRIVER_NAME, &cards[num_cards]);
@@ -626,14 +633,13 @@ init_driver(void)
#ifndef CARDBUS #ifndef CARDBUS
static void static void
make_device_names( make_device_names(echo_dev * card)
echo_dev * card)
{ {
#ifdef MIDI_SUPPORT #ifdef MIDI_SUPPORT
sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards+1); sprintf(card->midi.name, "midi/"DRIVER_NAME"/%ld", card-cards + 1);
names[num_names++] = card->midi.name; names[num_names++] = card->midi.name;
#endif #endif
sprintf(card->name, "audio/hmulti/"DRIVER_NAME"/%ld", card-cards+1); sprintf(card->name, "audio/hmulti/"DRIVER_NAME"/%ld", card-cards + 1);
names[num_names++] = card->name; names[num_names++] = card->name;
names[num_names] = NULL; names[num_names] = NULL;
@@ -851,7 +857,7 @@ echo_setup(echo_dev * card)
#ifdef ECHO3G_FAMILY #ifdef ECHO3G_FAMILY
if (card->type == ECHO3G) { if (card->type == ECHO3G) {
strncpy(card->caps.szName, ((C3g*)card->pEG)->Get3gBoxName(), strlcpy(card->caps.szName, ((C3g*)card->pEG)->Get3gBoxName(),
ECHO_MAXNAMELEN); ECHO_MAXNAMELEN);
} }
#endif #endif