From 9711d5d0638ef7df0cb4aa33ecba6afed7584981 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 9 Mar 2011 12:40:37 +0000 Subject: [PATCH] bzero -> memset git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1277 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/42fab7d679d39205a160375eda6a30e2655448bc Author: Jacek Jendrzej Date: 2011-03-09 (Wed, 09 Mar 2011) ------------------ This commit was generated by Migit --- lib/libnet/libnet.c | 6 +++--- src/nhttpd/tuxboxapi/coolstream/controlapi.cpp | 2 +- src/nhttpd/yhttpd_core/yhook.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libnet/libnet.c b/lib/libnet/libnet.c index 789742777..191d0e550 100644 --- a/lib/libnet/libnet.c +++ b/lib/libnet/libnet.c @@ -53,10 +53,10 @@ int netSetIP( char *dev, char *ip, char *mask, char *brdcast ) scanip( brdcast, adr_brdcast ); /* init structures */ - bzero(&req,sizeof(req)); + memset(&req,0,sizeof(req)); strcpy(req.ifr_name,dev); - bzero(&addr,sizeof(addr)); + memset(&addr,0,sizeof(addr)); addr.sin_family = AF_INET; addr.sin_addr.s_addr = *((unsigned long *) adr_ip); @@ -97,7 +97,7 @@ void netGetIP( char *dev, char *ip, char *mask, char *brdcast ) return; - bzero(&req,sizeof(req)); + memset(&req,0,sizeof(req)); strcpy(req.ifr_name,dev); saddr = (struct sockaddr_in *) &req.ifr_addr; addr= (unsigned char*) &saddr->sin_addr.s_addr; diff --git a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp index e346d8545..bbe288210 100644 --- a/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/controlapi.cpp @@ -1072,7 +1072,7 @@ void CControlAPI::channelEPGAsXML(CyhookHandler *hh, int bouquetnr, t_channel_id struct tm *mtime = localtime(&eventIterator->startTime); strftime(zbuffer,20,"%H:%M",mtime); hh->printf("\t%s\r\n", zbuffer); - bzero(zbuffer,25); + memset(zbuffer,0,sizeof(zbuffer)); strftime(zbuffer,20,"%d.%m.%Y",mtime); hh->printf("\t%s\r\n", zbuffer); hh->printf("\t%ld\r\n", eventIterator->startTime+eventIterator->duration); diff --git a/src/nhttpd/yhttpd_core/yhook.cpp b/src/nhttpd/yhttpd_core/yhook.cpp index 7fba8b603..2913eaf04 100644 --- a/src/nhttpd/yhttpd_core/yhook.cpp +++ b/src/nhttpd/yhttpd_core/yhook.cpp @@ -356,7 +356,7 @@ void CyhookHandler::SendHTMLFooter(void) { #define OUTBUFSIZE 4096 void CyhookHandler::printf(const char *fmt, ...) { char outbuf[OUTBUFSIZE]; - bzero(outbuf, OUTBUFSIZE); + memset(outbuf,0, OUTBUFSIZE); va_list arglist; va_start(arglist, fmt); vsnprintf(outbuf, OUTBUFSIZE, fmt, arglist);