From 23bcc0145346e641a0ecbf55eda36ae6b0e7fa9f Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 9 Mar 2011 12:55:31 +0000 Subject: [PATCH] memcpy -> memmove git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/85f5e1110d9b41ca4a85607de40e8f43d0c55cdf Author: Jacek Jendrzej Date: 2011-03-09 (Wed, 09 Mar 2011) ------------------ This commit was generated by Migit --- lib/libdvbsub/dvbsub.cpp | 2 +- lib/libmd5sum/md5.c | 8 +- lib/libmd5sum/sys2.h | 2 +- lib/libnet/libnet.c | 8 +- lib/libtuxtxt/tuxtxt.cpp | 98 +++++++++++----------- lib/libtuxtxt/tuxtxt_common.h | 12 +-- lib/libupnpclient/UPNPDevice.cpp | 2 +- lib/xmltree/xmlparse.cpp | 12 +-- lib/xmltree/xmltree.cpp | 6 +- src/driver/framebuffer.cpp | 16 ++-- src/driver/genpsi.c | 2 +- src/driver/pictureviewer/crw.cpp | 2 +- src/driver/pictureviewer/fb_display.cpp | 2 +- src/driver/pictureviewer/gif.cpp | 4 +- src/driver/pictureviewer/jpeg.cpp | 2 +- src/driver/pictureviewer/pictureviewer.cpp | 8 +- src/driver/pictureviewer/resize.cpp | 2 +- src/driver/streamts.cpp | 4 +- src/gui/audioplayer.cpp | 2 +- src/gui/cam_menu.cpp | 4 +- src/gui/infoviewer.cpp | 2 +- src/gui/ringbuffer.c | 8 +- src/gui/test_menu.cpp | 2 +- src/lcddisplay/lcddisplay.cpp | 4 +- src/sectionsd/SIevents.cpp | 2 +- src/sectionsd/SInetworks.hpp | 2 +- src/sectionsd/SIsections.cpp | 10 +-- src/sectionsd/SIsections.hpp | 6 +- src/sectionsd/dmxapi.cpp | 6 +- src/sectionsd/sectionsd.cpp | 6 +- src/system/ping.c | 2 +- src/zapit/lib/zapitclient.cpp | 2 +- src/zapit/src/ci.cpp | 2 +- src/zapit/src/frontend.cpp | 6 +- src/zapit/src/pmt.cpp | 6 +- src/zapit/src/udpstreampes.cpp | 4 +- 36 files changed, 134 insertions(+), 134 deletions(-) diff --git a/lib/libdvbsub/dvbsub.cpp b/lib/libdvbsub/dvbsub.cpp index ab27694ae..d9c8c9d04 100644 --- a/lib/libdvbsub/dvbsub.cpp +++ b/lib/libdvbsub/dvbsub.cpp @@ -297,7 +297,7 @@ static void* reader_thread(void * /*arg*/) buf = (uint8_t*) malloc(packlen); - memcpy(buf, tmp, 6); + memmove(buf, tmp, 6); /* read rest of the packet */ while((count < packlen) && !dvbsub_stopped) { len = dmx->Read(buf+count, packlen-count, 1000); diff --git a/lib/libmd5sum/md5.c b/lib/libmd5sum/md5.c index f69e22685..bb3669819 100644 --- a/lib/libmd5sum/md5.c +++ b/lib/libmd5sum/md5.c @@ -104,7 +104,7 @@ md5_finish_ctx (ctx, resbuf) ++ctx->total[1]; pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes; - memcpy (&ctx->buffer[bytes], fillbuf, pad); + memmove (&ctx->buffer[bytes], fillbuf, pad); /* Put the 64-bit file length in *bits* at the end of the buffer. */ *(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3); @@ -209,14 +209,14 @@ md5_process_bytes (buffer, len, ctx) size_t left_over = ctx->buflen; size_t add = 128 - left_over > len ? len : 128 - left_over; - memcpy (&ctx->buffer[left_over], buffer, add); + memmove (&ctx->buffer[left_over], buffer, add); ctx->buflen += add; if (left_over + add > 64) { md5_process_block (ctx->buffer, (left_over + add) & ~63, ctx); /* The regions in the following copy operation cannot overlap. */ - memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63], + memmove (ctx->buffer, &ctx->buffer[(left_over + add) & ~63], (left_over + add) & 63); ctx->buflen = (left_over + add) & 63; } @@ -236,7 +236,7 @@ md5_process_bytes (buffer, len, ctx) /* Move remaining bytes in internal buffer. */ if (len > 0) { - memcpy (ctx->buffer, buffer, len); + memmove (ctx->buffer, buffer, len); ctx->buflen = len; } } diff --git a/lib/libmd5sum/sys2.h b/lib/libmd5sum/sys2.h index 13201bb16..539d53823 100644 --- a/lib/libmd5sum/sys2.h +++ b/lib/libmd5sum/sys2.h @@ -167,7 +167,7 @@ off_t lseek (); #if ! defined HAVE_MEMPCPY && ! defined mempcpy /* Be CAREFUL that there are no side effects in N. */ -# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N))) +# define mempcpy(D, S, N) ((void *) ((char *) memmove (D, S, N) + (N))) #endif /* These are wrappers for functions/macros from GNU libc. diff --git a/lib/libnet/libnet.c b/lib/libnet/libnet.c index 191d0e550..70c6f2f2e 100644 --- a/lib/libnet/libnet.c +++ b/lib/libnet/libnet.c @@ -60,17 +60,17 @@ int netSetIP( char *dev, char *ip, char *mask, char *brdcast ) addr.sin_family = AF_INET; addr.sin_addr.s_addr = *((unsigned long *) adr_ip); - memcpy(&req.ifr_addr,&addr,sizeof(addr)); + memmove(&req.ifr_addr,&addr,sizeof(addr)); if( ioctl(fd,SIOCSIFADDR,&req) < 0 ) goto abbruch; addr.sin_addr.s_addr = *((unsigned long *) adr_mask); - memcpy(&req.ifr_addr,&addr,sizeof(addr)); + memmove(&req.ifr_addr,&addr,sizeof(addr)); if( ioctl(fd,SIOCSIFNETMASK,&req) < 0 ) goto abbruch; addr.sin_addr.s_addr = *((unsigned long *) adr_brdcast); - memcpy(&req.ifr_addr,&addr,sizeof(addr)); + memmove(&req.ifr_addr,&addr,sizeof(addr)); if( ioctl(fd,SIOCSIFBRDADDR,&req) < 0 ) goto abbruch; @@ -142,7 +142,7 @@ void netSetDefaultRoute( char *gw ) return; re.rt_flags = RTF_GATEWAY | RTF_UP; - memcpy(addr,adr_gw,4); + memmove(addr,adr_gw,4); ioctl(fd,SIOCADDRT,&re); diff --git a/lib/libtuxtxt/tuxtxt.cpp b/lib/libtuxtxt/tuxtxt.cpp index 9674fad2c..2e50865d7 100644 --- a/lib/libtuxtxt/tuxtxt.cpp +++ b/lib/libtuxtxt/tuxtxt.cpp @@ -50,7 +50,7 @@ void FillRect(int x, int y, int w, int h, int color) { for (xtmp=0; xtmp<=w; xtmp++) { - memcpy(p+xtmp*4,bgra[color],4); + memmove(p+xtmp*4,bgra[color],4); } p += fix_screeninfo.line_length; } @@ -2584,7 +2584,7 @@ void charpage() RenderCharFB(cachefill[col], &atrtable[ATR_WB]); } tstPageAttr atr; - memcpy(&atr,&atrtable[ATR_WB],sizeof(tstPageAttr)); + memmove(&atr,&atrtable[ATR_WB],sizeof(tstPageAttr)); int row; atr.charset = C_G0P; PosY = StartY+fontheight; @@ -2702,7 +2702,7 @@ void Menu_UpdateHotlist(char *menu, int hotindex, int menuitem) } hex2str(&menu[Menu_Width*MenuLine[M_HOT] + hotlistpagecolumn[menulanguage]], (hotindex >= 0) ? hotlist[hotindex] : tuxtxt_cache.page); - memcpy(&menu[Menu_Width*MenuLine[M_HOT] + hotlisttextcolumn[menulanguage]], &hotlisttext[menulanguage][(hotindex >= 0) ? 5 : 0], 5); + memmove(&menu[Menu_Width*MenuLine[M_HOT] + hotlisttextcolumn[menulanguage]], &hotlisttext[menulanguage][(hotindex >= 0) ? 5 : 0], 5); PosX = Menu_StartX + 20*fontwidth; PosY = Menu_StartY + MenuLine[M_HOT]*fontheight; @@ -2714,13 +2714,13 @@ void Menu_Init(char *menu, int current_pid, int menuitem, int hotindex) int byte, line; int national_subset_bak = national_subset; - memcpy(menu, configmenu[menulanguage], Menu_Height*Menu_Width); + memmove(menu, configmenu[menulanguage], Menu_Height*Menu_Width); if (getpidsdone) { memset(&menu[MenuLine[M_PID]*Menu_Width+3], 0x20,24); if (SDT_ready) - memcpy(&menu[MenuLine[M_PID]*Menu_Width+3+(24-pid_table[current_pid].service_name_len)/2], &pid_table[current_pid].service_name, pid_table[current_pid].service_name_len); + memmove(&menu[MenuLine[M_PID]*Menu_Width+3+(24-pid_table[current_pid].service_name_len)/2], &pid_table[current_pid].service_name, pid_table[current_pid].service_name_len); else hex2str(&menu[MenuLine[M_PID]*Menu_Width + 13 + 3], tuxtxt_cache.vtxtpid); } @@ -2732,21 +2732,21 @@ void Menu_Init(char *menu, int current_pid, int menuitem, int hotindex) /* set 16:9 modi, colors & national subset */ - memcpy(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3); + memmove(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3); menu[MenuLine[M_COL]*Menu_Width + 1] = (color_mode == 1 ? ' ' : 'í'); menu[MenuLine[M_COL]*Menu_Width + 28] = (color_mode == 24 ? ' ' : 'î'); memset(&menu[Menu_Width*MenuLine[M_COL] + 3 ], 0x7f,color_mode); memset(&menu[Menu_Width*MenuLine[M_COL] + 3+color_mode ], 0x20,24-color_mode); -// memcpy(&menu[Menu_Width*MenuLine[M_COL] + Menu_Width - 5], &configonoff[menulanguage][color_mode ? 3 : 0], 3); +// memmove(&menu[Menu_Width*MenuLine[M_COL] + Menu_Width - 5], &configonoff[menulanguage][color_mode ? 3 : 0], 3); menu[MenuLine[M_TRA]*Menu_Width + 1] = (trans_mode == 1 ? ' ' : 'í'); menu[MenuLine[M_TRA]*Menu_Width + 28] = (trans_mode == 24 ? ' ' : 'î'); memset(&menu[Menu_Width*MenuLine[M_TRA] + 3 ], 0x7f,trans_mode); memset(&menu[Menu_Width*MenuLine[M_TRA] + 3+trans_mode ], 0x20,24-trans_mode); - memcpy(&menu[Menu_Width*MenuLine[M_AUN] + Menu_Width - 5], &configonoff[menulanguage][auto_national ? 3 : 0], 3); + memmove(&menu[Menu_Width*MenuLine[M_AUN] + Menu_Width - 5], &configonoff[menulanguage][auto_national ? 3 : 0], 3); /*if (national_subset != NAT_DE)*/ - memcpy(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); + memmove(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); if (national_subset == 0 || auto_national) menu[MenuLine[M_NAT]*Menu_Width + 1] = ' '; if (national_subset == MAX_NATIONAL_SUBSET || auto_national) @@ -2764,7 +2764,7 @@ void Menu_Init(char *menu, int current_pid, int menuitem, int hotindex) national_subset = menusubset[menulanguage]; if (line == Menu_Height-2) - memcpy(&menu[line*Menu_Width + 21], versioninfo, 4); + memmove(&menu[line*Menu_Width + 21], versioninfo, 4); for (byte = 0; byte < Menu_Width; byte++) RenderCharFB(menu[line*Menu_Width + byte], &atrtable[menuatr[line*Menu_Width + byte] - '0' + ATR_MENU0]); @@ -2924,7 +2924,7 @@ void ConfigMenu(int Init) if (SDT_ready) { - memcpy(&menu[MenuLine[M_PID]*Menu_Width+3+(24-pid_table[current_pid].service_name_len)/2], + memmove(&menu[MenuLine[M_PID]*Menu_Width+3+(24-pid_table[current_pid].service_name_len)/2], &pid_table[current_pid].service_name, pid_table[current_pid].service_name_len); } @@ -2951,7 +2951,7 @@ void ConfigMenu(int Init) { national_subset = pid_table[current_pid].national_subset; - memcpy(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); + memmove(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); Menu_HighlightLine(menu, MenuLine[M_NAT], 0); } } @@ -3043,7 +3043,7 @@ void ConfigMenu(int Init) memset(&menu[MenuLine[M_PID]*Menu_Width + 3], ' ', 24); if (SDT_ready) - memcpy(&menu[MenuLine[M_PID]*Menu_Width + 3 + + memmove(&menu[MenuLine[M_PID]*Menu_Width + 3 + (24-pid_table[current_pid].service_name_len)/2], &pid_table[current_pid].service_name, pid_table[current_pid].service_name_len); @@ -3070,7 +3070,7 @@ void ConfigMenu(int Init) { if (getpidsdone) national_subset = pid_table[current_pid].national_subset; - memcpy(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); + memmove(&menu[Menu_Width*MenuLine[M_NAT] + 2], &countrystring[national_subset*COUNTRYSTRING_WIDTH], COUNTRYSTRING_WIDTH); Menu_HighlightLine(menu, MenuLine[M_NAT], 0); } } @@ -3325,7 +3325,7 @@ void ConfigMenu(int Init) screen_mode1++; screen_mode1 &= 1; - memcpy(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3); + memmove(&menu[Menu_Width*MenuLine[M_SC1] + Menu_Width - 5], &configonoff[menulanguage][screen_mode1 ? 3 : 0], 3); Menu_HighlightLine(menu, MenuLine[menuitem], 1); break; @@ -4108,7 +4108,7 @@ void RenderDRCS( //FIX ME // memset(d + ax[x], f1, ax[x+1] - ax[x]); for (ltmp=0 ; ltmp <= (ax[x+1]-ax[x]); ltmp++) { - memcpy(d + ax[x]*4 +ltmp*4,bgra[f1],4); + memmove(d + ax[x]*4 +ltmp*4,bgra[f1],4); } } if (ax[x+7] > ax[x+6]) @@ -4116,7 +4116,7 @@ void RenderDRCS( //FIX ME // memset(d + ax[x+6], f2, ax[x+7] - ax[x+6]); /* 2nd byte 6 pixels to the right */ for (ltmp=0 ; ltmp <= (ax[x+7]-ax[x+6]); ltmp++) { - memcpy(d + ax[x+6]*4 +ltmp*4,bgra[f2],4); + memmove(d + ax[x+6]*4 +ltmp*4,bgra[f2],4); } } @@ -4135,7 +4135,7 @@ void DrawVLine(int x, int y, int l, int color) for ( ; l > 0 ; l--) { - memcpy(p,bgra[color],4); + memmove(p,bgra[color],4); p += fix_screeninfo.line_length; } } @@ -4147,7 +4147,7 @@ void DrawHLine(int x, int y, int l, int color) { for (ltmp=0; ltmp <= l; ltmp++) { - memcpy(lfb + x*4 + ltmp*4 + y * fix_screeninfo.line_length, bgra[color], 4); + memmove(lfb + x*4 + ltmp*4 + y * fix_screeninfo.line_length, bgra[color], 4); } } } @@ -4176,7 +4176,7 @@ void FillTrapez(int x0, int y0, int l0, int xoffset1, int h, int l1, int color) { for (ltmp=0; ltmp <= l; ltmp++) { - memcpy(p + xoffset*4 +ltmp*4, bgra[color], 4); + memmove(p + xoffset*4 +ltmp*4, bgra[color], 4); } } p += fix_screeninfo.line_length; @@ -4190,10 +4190,10 @@ void FlipHorz(int x, int y, int w, int h) if(buf != NULL){ for (h1 = 0 ; h1 < h ; h1++) { - memcpy(buf,p,w*4); + memmove(buf,p,w*4); for (w1 = 0 ; w1 < w ; w1++) { - memcpy(p+w1*4,buf+((w-w1)*4)-4,4); + memmove(p+w1*4,buf+((w-w1)*4)-4,4); } p += fix_screeninfo.line_length; } @@ -4210,9 +4210,9 @@ void FlipVert(int x, int y, int w, int h) { p1 = (p+(h1*fix_screeninfo.line_length)); p2 = (p+(h-(h1+1))*fix_screeninfo.line_length); - memcpy(buf,p1,w*4); - memcpy(p1,p2,w*4); - memcpy(p2,buf,w*4); + memmove(buf,p1,w*4); + memmove(p1,p2,w*4); + memmove(p2,buf,w*4); } delete [] buf; } @@ -4472,7 +4472,7 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset) for (x=0; xbuffer,sbit->pitch*sbit->height); + memmove(sbitbuffer,sbit->buffer,sbit->pitch*sbit->height); for (Row = 0; Row < sbit->height; Row++) { @@ -4793,7 +4793,7 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset) for (Bit = xfactor * (sbit->left + TTFShiftX); Bit > 0; Bit--) /* fill left margin */ { for (f = factor-1; f >= 0; f--) - memcpy((p + f*fix_screeninfo.line_length),bgra[bgcolor],4);/*bgcolor*/ + memmove((p + f*fix_screeninfo.line_length),bgra[bgcolor],4);/*bgcolor*/ p+=4; if (!usettf) pixtodo--; @@ -4814,13 +4814,13 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset) color = bgcolor; for (f = factor-1; f >= 0; f--) - memcpy((p + f*fix_screeninfo.line_length),bgra[color],4); + memmove((p + f*fix_screeninfo.line_length),bgra[color],4); p+=4; if (xfactor > 1) /* double width */ { for (f = factor-1; f >= 0; f--) - memcpy((p + f*fix_screeninfo.line_length),bgra[color],4); + memmove((p + f*fix_screeninfo.line_length),bgra[color],4); p+=4; if (!usettf) @@ -4833,7 +4833,7 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset) Bit > 0; Bit--) /* fill rest of char width */ { for (f = factor-1; f >= 0; f--) - memcpy((p + f*fix_screeninfo.line_length),bgra[bgcolor],4); + memmove((p + f*fix_screeninfo.line_length),bgra[bgcolor],4); p+=4; } @@ -4928,7 +4928,7 @@ void RenderMessage(int Message) /* char message_8[] = "ã warte auf Empfang von Seite 100 äé"; */ /* char message_9[] = "ã Seite 100 existiert nicht! äé"; */ - memcpy(&message_1[24], versioninfo, 4); + memmove(&message_1[24], versioninfo, 4); /* reset zoom */ zoommode = 0; @@ -4950,11 +4950,11 @@ void RenderMessage(int Message) { pagecolumn = message8pagecolumn[menulanguage]; msg = message_8[menulanguage]; - memcpy(&message_4, msg, sizeof(message_4)); + memmove(&message_4, msg, sizeof(message_4)); hex2str(message_4+pagecolumn, tuxtxt_cache.page); if (SDT_ready) - memcpy(&message_2[2 + (35 - pid_table[current_service].service_name_len)/2], + memmove(&message_2[2 + (35 - pid_table[current_service].service_name_len)/2], &pid_table[current_service].service_name, pid_table[current_service].service_name_len); else if (Message == ShowServiceName) hex2str(&message_2[17+3], tuxtxt_cache.vtxtpid); @@ -5053,7 +5053,7 @@ void DoFlashing(int startrow) SetPosX(col); flashchar = page_char[index + col]; int doflash = 0; - memcpy(&flashattr,&page_atrb[index + col],sizeof(tstPageAttr)); + memmove(&flashattr,&page_atrb[index + col],sizeof(tstPageAttr)); switch (flashattr.flashing &0x1c) // Flash Rate { case 0x00 : // 1 Hz @@ -5285,7 +5285,7 @@ void RenderPage() else SetPosX(8); - memcpy(&page_char[8], pCachedPage->p0, 24); /* header line without timestring */ + memmove(&page_char[8], pCachedPage->p0, 24); /* header line without timestring */ for (col = 0; col < 24; col++) { RenderCharFB(pCachedPage->p0[col], &page_atrb[32]); @@ -5455,7 +5455,7 @@ void CreateLine25() PosY = TOPMENUSTARTY; memset(line, ' ', TOPMENUCHARS); /* init with spaces */ - memcpy(line+TOPMENUINDENTBLK, tuxtxt_cache.adip[prev_100], 12); + memmove(line+TOPMENUINDENTBLK, tuxtxt_cache.adip[prev_100], 12); hex2str(&line[TOPMENUINDENTDEF+12+TOPMENUSPC+2], prev_100); RenderClearMenuLineBB(line, &atrtable[ATR_L250], &atrtable[ATR_TOPMENU2]); @@ -5533,7 +5533,7 @@ void CreateLine25() if (!attr) attr = &atrtable[ATR_WB]; } - memcpy(line+indent, tuxtxt_cache.adip[current], 12); + memmove(line+indent, tuxtxt_cache.adip[current], 12); hex2str(&line[TOPMENUINDENTDEF+12+TOPMENUSPC+2], current); RenderClearMenuLineBB(line, attrcol, attr); } @@ -5570,7 +5570,7 @@ void CopyBB2FB() if (ioctl(fb, FBIOPAN_DISPLAY, &var_screeninfo) == -1) perror("TuxTxt "); #else - memcpy(lfb, lfb+fix_screeninfo.line_length * var_screeninfo.yres, fix_screeninfo.line_length*var_screeninfo.yres); + memmove(lfb, lfb+fix_screeninfo.line_length * var_screeninfo.yres, fix_screeninfo.line_length*var_screeninfo.yres); #endif /* adapt background of backbuffer if changed */ @@ -5598,7 +5598,7 @@ void CopyBB2FB() } /* copy line25 in normal height */ if (!pagecatching ) - memcpy(dst+(24*fontheight)*fix_screeninfo.line_length, src + (24*fontheight)*fix_screeninfo.line_length, fix_screeninfo.line_length*fontheight); + memmove(dst+(24*fontheight)*fix_screeninfo.line_length, src + (24*fontheight)*fix_screeninfo.line_length, fix_screeninfo.line_length*fontheight); if (transpmode) fillcolor = transp; @@ -5620,7 +5620,7 @@ void CopyBB2FB() topdst += screenwidth; for (i=0; i < 24*fontheight; i++) { - memcpy(topdst, topsrc, width); + memmove(topdst, topsrc, width); topdst += fix_screeninfo.line_length; topsrc += fix_screeninfo.line_length; } @@ -5634,15 +5634,15 @@ void CopyBB2FB() { for (swtmp=0; swtmp<=screenwidth; swtmp++) { - memcpy(dst - i*fix_screeninfo.line_length+swtmp*4, bgra[fillcolor], 4); + memmove(dst - i*fix_screeninfo.line_length+swtmp*4, bgra[fillcolor], 4); } } for (i = 12*fontheight; i; i--) { - memcpy(dst, src, screenwidth); + memmove(dst, src, screenwidth); dst += fix_screeninfo.line_length; - memcpy(dst, src, screenwidth); + memmove(dst, src, screenwidth); dst += fix_screeninfo.line_length; src += fix_screeninfo.line_length; } @@ -5651,7 +5651,7 @@ void CopyBB2FB() { for (swtmp=0; swtmp<= screenwidth;swtmp++) { - memcpy(dst + fix_screeninfo.line_length*(fontheight+i)+swtmp*4, bgra[fillcolor], 4); + memmove(dst + fix_screeninfo.line_length*(fontheight+i)+swtmp*4, bgra[fillcolor], 4); } } } @@ -5848,14 +5848,14 @@ void DecodePage() tuxtxt_decompress_page(tuxtxt_cache.page,tuxtxt_cache.subpage,&page_char[40]); - memcpy(&page_char[8], pCachedPage->p0, 24); /* header line without timestring */ + memmove(&page_char[8], pCachedPage->p0, 24); /* header line without timestring */ pageinfo = &(pCachedPage->pageinfo); if (pageinfo->p24) - memcpy(&page_char[24*40], pageinfo->p24, 40); /* line 25 for FLOF */ + memmove(&page_char[24*40], pageinfo->p24, 40); /* line 25 for FLOF */ /* copy timestring */ - memcpy(&page_char[32], &tuxtxt_cache.timestring, 8); + memmove(&page_char[32], &tuxtxt_cache.timestring, 8); /* check for newsflash & subtitle */ if (pageinfo->boxed && tuxtxt_is_dec(tuxtxt_cache.page)) @@ -5912,7 +5912,7 @@ void DecodePage() int d = deh24(p); if (d < 0) { - memcpy(p, "???", 3); + memmove(p, "???", 3); p += 3; } else diff --git a/lib/libtuxtxt/tuxtxt_common.h b/lib/libtuxtxt/tuxtxt_common.h index 837212934..489f70111 100644 --- a/lib/libtuxtxt/tuxtxt_common.h +++ b/lib/libtuxtxt/tuxtxt_common.h @@ -57,7 +57,7 @@ void tuxtxt_compress_page(int p, int sp, unsigned char* buffer) if (pg->pData) { pg->ziplen = comprlen; - memcpy(pg->pData,pagecompressed,comprlen); + memmove(pg->pData,pagecompressed,comprlen); } } #elif TUXTXT_COMPRESS == 2 @@ -75,14 +75,14 @@ void tuxtxt_compress_page(int p, int sp, unsigned char* buffer) pg->pData = (unsigned char*)malloc(j); if (pg->pData) { - memcpy(pg->pData,cbuf,j); + memmove(pg->pData,cbuf,j); } else memset(pg->bitmask,0,sizeof(pg->bitmask)); #else //if (pg->pData) - memcpy(pg->data,buffer,23*40); + memmove(pg->data,buffer,23*40); #endif pthread_mutex_unlock(&tuxtxt_cache_lock); @@ -120,7 +120,7 @@ void tuxtxt_decompress_page(int p, int sp, unsigned char* buffer) } #else { - memcpy(buffer,pg->data,23*40); + memmove(buffer,pg->data,23*40); #endif } pthread_mutex_unlock(&tuxtxt_cache_lock); @@ -772,7 +772,7 @@ void *tuxtxt_CacheThread(void * /*arg*/) for (byte = 2; byte < 42; byte++) *p++ = dehamming[vtxt_row[byte]]; /* decode hamming 8/4 */ else /* other hex page: no parity check, just copy */ - memcpy(p, &vtxt_row[2], 40); + memmove(p, &vtxt_row[2], 40); } } else if (packet_number == 27) @@ -927,7 +927,7 @@ void *tuxtxt_CacheThread(void * /*arg*/) if (!(pageinfo_thread->ext->p26[descode])) pageinfo_thread->ext->p26[descode] = (unsigned char*) malloc(13 * 3); if (pageinfo_thread->ext->p26[descode]) - memcpy(pageinfo_thread->ext->p26[descode], &vtxt_row[3], 13 * 3); + memmove(pageinfo_thread->ext->p26[descode], &vtxt_row[3], 13 * 3); #if 0//TUXTXT_DEBUG int i, t, m; diff --git a/lib/libupnpclient/UPNPDevice.cpp b/lib/libupnpclient/UPNPDevice.cpp index 86afef8d2..8c23ac0a1 100644 --- a/lib/libupnpclient/UPNPDevice.cpp +++ b/lib/libupnpclient/UPNPDevice.cpp @@ -422,7 +422,7 @@ std::string CUPnPDevice::HTTP(std::string url, std::string post, std::string act memset(&socktcp, 0, sizeof(struct sockaddr_in)); socktcp.sin_family = AF_INET; socktcp.sin_port = htons(port); - memcpy((char *)&socktcp.sin_addr, hp->h_addr, hp->h_length); + memmove((char *)&socktcp.sin_addr, hp->h_addr, hp->h_length); if (connect(t_socket, (struct sockaddr*) &socktcp, sizeof(struct sockaddr_in))) { diff --git a/lib/xmltree/xmlparse.cpp b/lib/xmltree/xmlparse.cpp index 7a2189ad6..95643c609 100644 --- a/lib/xmltree/xmlparse.cpp +++ b/lib/xmltree/xmlparse.cpp @@ -288,7 +288,7 @@ int XML_Parser::Parse(const char *s, int len, int isFinal) bufferLim=buffer+len*2; }; - memcpy(buffer, end, nLeftOver); + memmove(buffer, end, nLeftOver); bufferPtr=buffer; bufferEnd=buffer+nLeftOver; @@ -298,7 +298,7 @@ int XML_Parser::Parse(const char *s, int len, int isFinal) } else { - memcpy(GetBuffer(len), s, len); + memmove(GetBuffer(len), s, len); return ParseBuffer(len, isFinal); }; } @@ -365,7 +365,7 @@ void *XML_Parser::GetBuffer(int len) if (bufferPtr) { - memcpy(newBuf, bufferPtr, bufferEnd-bufferPtr); + memmove(newBuf, bufferPtr, bufferEnd-bufferPtr); free(buffer); }; @@ -783,7 +783,7 @@ enum XML_Error XML_Parser::doContent(int startTagLevel, const ENCODING *enc, con tag->bufEnd=tag->buf+bufSize; }; - memcpy(tag->buf, tag->rawName, tag->rawNameLength); + memmove(tag->buf, tag->rawName, tag->rawNameLength); tag->rawName=tag->buf; }; @@ -2686,7 +2686,7 @@ static int poolGrow(STRING_POOL *pool) pool->blocks=pool->freeBlocks; pool->freeBlocks=tem; - memcpy(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char)); + memmove(pool->blocks->s, pool->start, (pool->end-pool->start)*sizeof(XML_Char)); pool->ptr=pool->blocks->s+(pool->ptr-pool->start); pool->start=pool->blocks->s; @@ -2728,7 +2728,7 @@ static int poolGrow(STRING_POOL *pool) pool->blocks=tem; - memcpy(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char)); + memmove(tem->s, pool->start, (pool->ptr-pool->start)*sizeof(XML_Char)); pool->ptr=tem->s+(pool->ptr-pool->start); pool->start=tem->s; diff --git a/lib/xmltree/xmltree.cpp b/lib/xmltree/xmltree.cpp index 346bde2fd..e487df5a8 100644 --- a/lib/xmltree/xmltree.cpp +++ b/lib/xmltree/xmltree.cpp @@ -325,7 +325,7 @@ void XMLTreeNode::SetData(char *dat, unsigned int datSize) data=new char[dataSize+1]; data[dataSize]=0; - memcpy(data, dat, datSize); + memmove(data, dat, datSize); } void XMLTreeNode::AppendData(char *dat, unsigned int datSize) @@ -337,8 +337,8 @@ void XMLTreeNode::AppendData(char *dat, unsigned int datSize) char *tmp; tmp=new char[dataSize+datSize]; - memcpy(tmp, data, dataSize); - memcpy(tmp+dataSize, dat, datSize); + memmove(tmp, data, dataSize); + memmove(tmp+dataSize, dat, datSize); SetData(tmp, dataSize+datSize); diff --git a/src/driver/framebuffer.cpp b/src/driver/framebuffer.cpp index 2bf0ed123..1e6d761b1 100644 --- a/src/driver/framebuffer.cpp +++ b/src/driver/framebuffer.cpp @@ -227,7 +227,7 @@ void CFrameBuffer::init(const char * const fbDevice) goto nolfb; } - memcpy(&oldscreen, &screeninfo, sizeof(screeninfo)); + memmove(&oldscreen, &screeninfo, sizeof(screeninfo)); if (ioctl(fd, FBIOGET_FSCREENINFO, &fix)<0) { perror("FBIOGET_FSCREENINFO"); @@ -1484,7 +1484,7 @@ void CFrameBuffer::paintBackgroundBoxRel(int x, int y, int dx, int dy) fb_pixel_t * bkpos = background + x + BACKGROUNDIMAGEWIDTH * y; for(int count = 0;count < dy; count++) { - memcpy(fbpos, bkpos, dx * sizeof(fb_pixel_t)); + memmove(fbpos, bkpos, dx * sizeof(fb_pixel_t)); fbpos += stride; bkpos += BACKGROUNDIMAGEWIDTH; } @@ -1499,7 +1499,7 @@ void CFrameBuffer::paintBackground() if (useBackgroundPaint && (background != NULL)) { for (int i = 0; i < 576; i++) - memcpy(((uint8_t *)getFrameBufferPointer()) + i * stride, (background + i * BACKGROUNDIMAGEWIDTH), BACKGROUNDIMAGEWIDTH * sizeof(fb_pixel_t)); + memmove(((uint8_t *)getFrameBufferPointer()) + i * stride, (background + i * BACKGROUNDIMAGEWIDTH), BACKGROUNDIMAGEWIDTH * sizeof(fb_pixel_t)); } else { @@ -1530,7 +1530,7 @@ void CFrameBuffer::SaveScreen(int x, int y, int dx, int dy, fb_pixel_t * const m fb_pixel_t * bkpos = memp; for (int count = 0; count < dy; count++) { - memcpy(bkpos, fbpos, dx * sizeof(fb_pixel_t)); + memmove(bkpos, fbpos, dx * sizeof(fb_pixel_t)); fbpos += stride; bkpos += dx; } @@ -1547,7 +1547,7 @@ void CFrameBuffer::RestoreScreen(int x, int y, int dx, int dy, fb_pixel_t * cons fb_pixel_t * bkpos = memp; for (int count = 0; count < dy; count++) { - memcpy(fbpos, bkpos, dx * sizeof(fb_pixel_t)); + memmove(fbpos, bkpos, dx * sizeof(fb_pixel_t)); fbpos += stride; bkpos += dx; } @@ -1562,7 +1562,7 @@ void CFrameBuffer::switch_signal (int signal) virtual_fb = new uint8_t[thiz->stride * thiz->yRes]; thiz->active = false; if (virtual_fb != NULL) - memcpy(virtual_fb, thiz->lfb, thiz->stride * thiz->yRes); + memmove(virtual_fb, thiz->lfb, thiz->stride * thiz->yRes); ioctl(thiz->tty, VT_RELDISP, 1); printf ("release display\n"); } @@ -1572,7 +1572,7 @@ void CFrameBuffer::switch_signal (int signal) printf ("acquire display\n"); thiz->paletteSet(NULL); if (virtual_fb != NULL) - memcpy(thiz->lfb, virtual_fb, thiz->stride * thiz->yRes); + memmove(thiz->lfb, virtual_fb, thiz->stride * thiz->yRes); else memset(thiz->lfb, 0, thiz->stride * thiz->yRes); } @@ -1674,7 +1674,7 @@ void CFrameBuffer::blit2FB(void *fbbuff, uint32_t width, uint32_t height, uint32 } #if 0 for(int i = 0; i < yc; i++){ - memcpy(clfb + (i + yoff)*stride + xoff*4, ip + (i + yp)*width + xp, xc*4); + memmove(clfb + (i + yoff)*stride + xoff*4, ip + (i + yp)*width + xp, xc*4); } #endif } diff --git a/src/driver/genpsi.c b/src/driver/genpsi.c index e0628cb75..eeca06d22 100644 --- a/src/driver/genpsi.c +++ b/src/driver/genpsi.c @@ -188,7 +188,7 @@ static int copy_template(uint8_t *dst, uint8_t *src, int len) //-- reset buffer -- memset(dst, 0xFF, SIZE_TS_PKT); //-- copy PMT template -- - memcpy(dst, src, len); + memmove(dst, src, len); return len; } diff --git a/src/driver/pictureviewer/crw.cpp b/src/driver/pictureviewer/crw.cpp index 667c58a23..632e1ca73 100644 --- a/src/driver/pictureviewer/crw.cpp +++ b/src/driver/pictureviewer/crw.cpp @@ -215,7 +215,7 @@ int fh_crw_load(const char *filename,unsigned char **buffer,int* xp,int* /*yp*/) while(ciptr->output_scanline < ciptr->output_height) { jpeg_read_scanlines(ciptr, &lb, 1); - memcpy(bp,lb,px*c); + memmove(bp,lb,px*c); bp+=px*c; } diff --git a/src/driver/pictureviewer/fb_display.cpp b/src/driver/pictureviewer/fb_display.cpp index 39140b854..469b07815 100644 --- a/src/driver/pictureviewer/fb_display.cpp +++ b/src/driver/pictureviewer/fb_display.cpp @@ -78,7 +78,7 @@ void blit2FB(void *fbbuff, unsigned int stride = CFrameBuffer::getInstance()->getStride(); for(i = 0; i < yc; i++){ - memcpy(lfb+(i+yoffs)*stride+xoffs*4, ip + (i+yp)*pic_xs+xp, xc*4); + memmove(lfb+(i+yoffs)*stride+xoffs*4, ip + (i+yp)*pic_xs+xp, xc*4); } } diff --git a/src/driver/pictureviewer/gif.cpp b/src/driver/pictureviewer/gif.cpp index 5f43dd3d6..1246f6ab8 100644 --- a/src/driver/pictureviewer/gif.cpp +++ b/src/driver/pictureviewer/gif.cpp @@ -87,7 +87,7 @@ int fh_gif_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/) { if(DGifGetLine(gft,slb,px)==GIF_ERROR) mgrflush; m_rend_gif_decodecolormap(slb,lb,cmap,cmaps,px); - memcpy(fbptr,lb,px*3); + memmove(fbptr,lb,px*3); } } else @@ -99,7 +99,7 @@ int fh_gif_load(const char *name,unsigned char **buffer,int* /*xp*/,int* /*yp*/) { if(DGifGetLine(gft,slb,px)==GIF_ERROR) mgrflush; m_rend_gif_decodecolormap(slb,lb,cmap,cmaps,px); - memcpy(fbptr,lb,px*3); + memmove(fbptr,lb,px*3); } } } diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index da8bcd0e1..af21304ea 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -203,7 +203,7 @@ int fh_jpeg_load_local(const char *filename,unsigned char **buffer,int* x,int* y while(ciptr->output_scanline < ciptr->output_height) { jpeg_read_scanlines(ciptr, &lb, 1); - memcpy(bp,lb,px*c); + memmove(bp,lb,px*c); bp+=px*c; } diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp index c4751650b..be190e40e 100644 --- a/src/driver/pictureviewer/pictureviewer.cpp +++ b/src/driver/pictureviewer/pictureviewer.cpp @@ -380,9 +380,9 @@ void CPictureViewer::showBusy (int sx, int sy, int width, char r, char g, char b for (int y = sy; y < sy + width; y++) { for (int x = sx; x < sx + width; x++) { - memcpy (busy_buffer_wrk, fb + y * stride + x * cpp, cpp); + memmove (busy_buffer_wrk, fb + y * stride + x * cpp, cpp); busy_buffer_wrk += cpp; - memcpy (fb + y * stride + x * cpp, fb_buffer, cpp); + memmove (fb + y * stride + x * cpp, fb_buffer, cpp); } } m_busy_x = sx; @@ -403,7 +403,7 @@ void CPictureViewer::hideBusy () for (int y = m_busy_y; y < m_busy_y + m_busy_width; y++) { for (int x = m_busy_x; x < m_busy_x + m_busy_width; x++) { - memcpy (fb + y * stride + x * m_busy_cpp, busy_buffer_wrk, m_busy_cpp); + memmove (fb + y * stride + x * m_busy_cpp, busy_buffer_wrk, m_busy_cpp); busy_buffer_wrk += m_busy_cpp; } } @@ -624,7 +624,7 @@ unsigned char * CPictureViewer::Resize(unsigned char *orgin, int ox, int oy, int for(i=0,k=0;imemory = (char *)myrealloc(mem->memory, mem->size + realsize + 1); if (mem->memory) { - memcpy(&(mem->memory[mem->size]), ptr, realsize); + memmove(&(mem->memory[mem->size]), ptr, realsize); mem->size += realsize; mem->memory[mem->size] = 0; } diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 638867119..3148499fb 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -305,7 +305,7 @@ int CCAMMenuHandler::handleCamMsg (const neutrino_msg_t msg, neutrino_msg_data_t if (!(Msg.Flags & CA_MESSAGE_HAS_PARAM1_DATA)) return -1; - memcpy(pMenu, (MMI_MENU_LIST_INFO*)Msg.Msg.Data[0], sizeof(MMI_MENU_LIST_INFO)); + memmove(pMenu, (MMI_MENU_LIST_INFO*)Msg.Msg.Data[0], sizeof(MMI_MENU_LIST_INFO)); free((void *)Msg.Msg.Data[0]); printf("CCAMMenuHandler::handleCamMsg: slot %d menu ready, title %s choices %d\n", curslot, convertDVBUTF8(pMenu->title, strlen(pMenu->title), 0).c_str(), pMenu->choice_nb); @@ -402,7 +402,7 @@ int CCAMMenuHandler::handleCamMsg (const neutrino_msg_t msg, neutrino_msg_data_t if (!(Msg.Flags & CA_MESSAGE_HAS_PARAM1_DATA)) return -1; - memcpy(pMmiEnquiry, (MMI_ENGUIRY_INFO *)Msg.Msg.Data[0], sizeof(MMI_ENGUIRY_INFO)); + memmove(pMmiEnquiry, (MMI_ENGUIRY_INFO *)Msg.Msg.Data[0], sizeof(MMI_ENGUIRY_INFO)); free((void *)Msg.Msg.Data[0]); printf("CCAMMenuHandler::handleCamMsg: slot %d input request, text %s\n", curslot, convertDVBUTF8(pMmiEnquiry->enguiryText, strlen(pMmiEnquiry->enguiryText), 0).c_str()); hideHintBox(); diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index f7d6e5015..091232658 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1537,7 +1537,7 @@ void CInfoViewer::show_Data (bool calledFromEvent) display_Info(NULL, g_Locale->getText(gotTime ? LOCALE_INFOVIEWER_NOEPG : LOCALE_INFOVIEWER_WAITTIME)); /* send message. Parental pin check gets triggered on EPG events... */ char *p = new char[sizeof(t_channel_id)]; - memcpy(p, &channel_id, sizeof(t_channel_id)); + memmove(p, &channel_id, sizeof(t_channel_id)); /* clear old info in getEPG */ CSectionsdClient::CurrentNextInfo dummy; getEPG(0, dummy); diff --git a/src/gui/ringbuffer.c b/src/gui/ringbuffer.c index 8d5354f7b..f017ab44a 100755 --- a/src/gui/ringbuffer.c +++ b/src/gui/ringbuffer.c @@ -150,12 +150,12 @@ ringbuffer_read (ringbuffer_t * rb, char *dest, size_t cnt) n2 = 0; } - memcpy (dest, &(rb->buf[rb->read_ptr]), n1); + memmove (dest, &(rb->buf[rb->read_ptr]), n1); rb->read_ptr += n1; rb->read_ptr &= rb->size_mask; if (n2) { - memcpy (dest + n1, &(rb->buf[rb->read_ptr]), n2); + memmove (dest + n1, &(rb->buf[rb->read_ptr]), n2); rb->read_ptr += n2; rb->read_ptr &= rb->size_mask; } @@ -190,12 +190,12 @@ ringbuffer_write (ringbuffer_t * rb, char *src, size_t cnt) n2 = 0; } - memcpy (&(rb->buf[rb->write_ptr]), src, n1); + memmove (&(rb->buf[rb->write_ptr]), src, n1); rb->write_ptr += n1; rb->write_ptr &= rb->size_mask; if (n2) { - memcpy (&(rb->buf[rb->write_ptr]), src + n1, n2); + memmove (&(rb->buf[rb->write_ptr]), src + n1, n2); rb->write_ptr += n2; rb->write_ptr &= rb->size_mask; } diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index f87ce7158..c4f034729 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -95,7 +95,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) for (int i = 0; i < 12; i++) { - memcpy(&text[i*len], buf, len); + memmove(&text[i*len], buf, len); } text[12*len] = 0; diff --git a/src/lcddisplay/lcddisplay.cpp b/src/lcddisplay/lcddisplay.cpp index 2144fdee1..4d71b3192 100644 --- a/src/lcddisplay/lcddisplay.cpp +++ b/src/lcddisplay/lcddisplay.cpp @@ -423,11 +423,11 @@ bool CLCDDisplay::paintIcon(std::string filename, int x, int y, bool invert) } void CLCDDisplay::dump_screen(raw_display_t *screen) { - memcpy(screen, raw, sizeof(raw_display_t)); + memmove(screen, raw, sizeof(raw_display_t)); } void CLCDDisplay::load_screen(const raw_display_t * const screen) { - memcpy(raw, screen, sizeof(raw_display_t)); + memmove(raw, screen, sizeof(raw_display_t)); } bool CLCDDisplay::load_png(const char * const filename) diff --git a/src/sectionsd/SIevents.cpp b/src/sectionsd/SIevents.cpp index f759c3f47..34f698ef9 100644 --- a/src/sectionsd/SIevents.cpp +++ b/src/sectionsd/SIevents.cpp @@ -445,7 +445,7 @@ SIevent SIevent::readActualEvent(t_service_id serviceID, unsigned timeoutInSecon } // Den Header kopieren - memcpy(buf, &header, sizeof(header)); + memmove(buf, &header, sizeof(header)); rc = readNbytes(fd, &buf[sizeof(header)], section_length - 5, timeoutInSeconds); if(!rc) { diff --git a/src/sectionsd/SInetworks.hpp b/src/sectionsd/SInetworks.hpp index 22d229768..74284e023 100644 --- a/src/sectionsd/SInetworks.hpp +++ b/src/sectionsd/SInetworks.hpp @@ -144,7 +144,7 @@ public: transport_stream_id = s.transport_stream_id; delivery_type = s.delivery_type; is_actual = s.is_actual; - memcpy(delivery_descriptor, s.delivery_descriptor, sizeof(struct satellite_delivery_descriptor)); + memmove(delivery_descriptor, s.delivery_descriptor, sizeof(struct satellite_delivery_descriptor)); } t_network_id network_id; diff --git a/src/sectionsd/SIsections.cpp b/src/sectionsd/SIsections.cpp index af9074c8b..75b9aa040 100644 --- a/src/sectionsd/SIsections.cpp +++ b/src/sectionsd/SIsections.cpp @@ -1215,7 +1215,7 @@ void SIsectionNIT::copyDeliveryDescriptor(const char *buf, SInetwork &s) { //struct descr_generic_header *sv=(struct descr_generic_header *)buf; buf+=sizeof(struct descr_generic_header); - memcpy(s.delivery_descriptor, buf, sizeof(struct satellite_delivery_descriptor)); //same size as cable... + memmove(s.delivery_descriptor, buf, sizeof(struct satellite_delivery_descriptor)); //same size as cable... //printf("Bouquet-Name: %s\n", s.bouquetName.c_str()); } @@ -1390,7 +1390,7 @@ int SIsections :: readSections(const unsigned short pid, const unsigned char fil } // Den Header kopieren - memcpy(buf, &header, sizeof(header)); + memmove(buf, &header, sizeof(header)); rc = readNbytes(fd, &buf[sizeof(header)], section_length - 5, timeoutInSeconds); @@ -1459,7 +1459,7 @@ int SIsections :: readSections(const unsigned short pid, const unsigned char fil } // Den Header kopieren (evtl. malloc und realloc nehmen) - memcpy(buf, &header, sizeof(header)); + memmove(buf, &header, sizeof(header)); // den Rest der Section einlesen rc = readNbytes(fd, &buf[sizeof(header)], section_length - 5, timeoutInSeconds); @@ -1513,7 +1513,7 @@ int SIsections :: readSections(const unsigned short pid, const unsigned char fil //printf("Debug: t: 0x%02x s: %u nr: %u last: %u max: %u l: %u\n", actualTableID, actualTableIDextension, k->sectionNumber(), lastNr, maxNr, l); struct SI_section_header h; - memcpy(&h, k->header(), sizeof(struct SI_section_header)); + memmove(&h, k->header(), sizeof(struct SI_section_header)); h.section_number = l; missingSections.insert(SIsection(&h)); } @@ -1578,7 +1578,7 @@ int SIsections :: readSections(const unsigned short pid, const unsigned char fil } // Den Header kopieren (evtl. malloc und realloc nehmen) - memcpy(buf, &header, sizeof(header)); + memmove(buf, &header, sizeof(header)); // den Rest der Section einlesen rc = readNbytes(fd, &buf[sizeof(header)], section_length - 5, timeoutInSeconds); diff --git a/src/sectionsd/SIsections.hpp b/src/sectionsd/SIsections.hpp index 9d497536d..d71d9ccd3 100644 --- a/src/sectionsd/SIsections.hpp +++ b/src/sectionsd/SIsections.hpp @@ -263,7 +263,7 @@ public: buffer = new char[bufLength]; if (buffer) { bufferLength = bufLength; - memcpy(buffer, buf, bufLength); + memmove(buffer, buf, bufLength); } } } @@ -285,7 +285,7 @@ public: bufferLength = 0; buffer = new char[sizeof(struct SI_section_header)]; if (buffer) { - memcpy(buffer, header, sizeof(struct SI_section_header)); + memmove(buffer, header, sizeof(struct SI_section_header)); bufferLength = sizeof(struct SI_section_header); } } @@ -297,7 +297,7 @@ public: buffer = new char[s.bufferLength]; if (buffer) { bufferLength = s.bufferLength; - memcpy(buffer, s.buffer, bufferLength); + memmove(buffer, s.buffer, bufferLength); } } } diff --git a/src/sectionsd/dmxapi.cpp b/src/sectionsd/dmxapi.cpp index df318c473..b432dd918 100644 --- a/src/sectionsd/dmxapi.cpp +++ b/src/sectionsd/dmxapi.cpp @@ -148,10 +148,10 @@ bool getUTC(UTC_t * const UTC, const bool TDT) return false; } memset(&tdt_tot_header, 0, sizeof(tdt_tot_header)); - memcpy(&tdt_tot_header, buf, size); + memmove(&tdt_tot_header, buf, size); int64_t tmp = tdt_tot_header.UTC_time.time; - memcpy(cUTC, (&tdt_tot_header.UTC_time), 5); + memmove(cUTC, (&tdt_tot_header.UTC_time), 5); if ((cUTC[2] > 0x23) || (cUTC[3] > 0x59) || (cUTC[4] > 0x59)) // no valid time { printf("[sectionsd] getUTC: invalid %s section received: %02x %02x %02x %02x %02x\n", @@ -174,7 +174,7 @@ bool getUTC(UTC_t * const UTC, const bool TDT) to = (struct descrLocalTimeOffset *)&b2[2]; unsigned char cc[4]; cc[3] = 0; - memcpy(cc, to->country_code, 3); + memmove(cc, to->country_code, 3); time_t t = changeUTCtoCtime(&b2[2+6],0); xprintf("getUTC(TOT): len=%d cc=%s reg_id=%d " "pol=%d offs=%04x new=%04x when=%s", diff --git a/src/sectionsd/sectionsd.cpp b/src/sectionsd/sectionsd.cpp index 706ac2bfc..5ec1419f0 100644 --- a/src/sectionsd/sectionsd.cpp +++ b/src/sectionsd/sectionsd.cpp @@ -3407,12 +3407,12 @@ static void sendEPG(int connfd, const SIevent& e, const SItime& t, int shortepg // add length *p = (unsigned char)e.contentClassification.length(); p++; - memcpy(p, e.contentClassification.data(), e.contentClassification.length()); + memmove(p, e.contentClassification.data(), e.contentClassification.length()); p += e.contentClassification.length(); *p = (unsigned char)e.userClassification.length(); p++; - memcpy(p, e.userClassification.data(), e.userClassification.length()); + memmove(p, e.userClassification.data(), e.userClassification.length()); p += e.userClassification.length(); *p = e.getFSK(); @@ -5049,7 +5049,7 @@ bool sectionsd_parse_command(CBasicMessage::Header &rmsg, int connfd) struct sectionsd::msgRequestHeader header; - memcpy(&header, &rmsg, sizeof(CBasicMessage::Header)); + memmove(&header, &rmsg, sizeof(CBasicMessage::Header)); memset(((char *)&header) + sizeof(CBasicMessage::Header), 0, sizeof(header) - sizeof(CBasicMessage::Header)); bool readbytes = readNbytes(connfd, ((char *)&header) + sizeof(CBasicMessage::Header), sizeof(header) - sizeof(CBasicMessage::Header), READ_TIMEOUT_IN_SECONDS); diff --git a/src/system/ping.c b/src/system/ping.c index 742f33e59..30ea323c4 100644 --- a/src/system/ping.c +++ b/src/system/ping.c @@ -84,7 +84,7 @@ send_ping( const char *host, struct sockaddr_in *taddr ) } if(( hp = gethostbyname( host )) != NULL ){ - memcpy( &taddr->sin_addr, hp->h_addr_list[0], sizeof( taddr->sin_addr )); + memmove( &taddr->sin_addr, hp->h_addr_list[0], sizeof( taddr->sin_addr )); taddr->sin_port = 0; taddr->sin_family = AF_INET; } diff --git a/src/zapit/lib/zapitclient.cpp b/src/zapit/lib/zapitclient.cpp index 4cf8b26ce..1aacc88f4 100644 --- a/src/zapit/lib/zapitclient.cpp +++ b/src/zapit/lib/zapitclient.cpp @@ -522,7 +522,7 @@ bool CZapitClient::get_current_TP(TP_params* TP) TP_params TP_temp; send(CZapitMessages::CMD_GET_CURRENT_TP); bool reply = CBasicClient::receive_data((char*)&TP_temp, sizeof(TP_temp)); - memcpy(TP, &TP_temp, sizeof(TP_temp)); + memmove(TP, &TP_temp, sizeof(TP_temp)); close_connection(); return reply; } diff --git a/src/zapit/src/ci.cpp b/src/zapit/src/ci.cpp index 2ff26dd47..b71e1e649 100644 --- a/src/zapit/src/ci.cpp +++ b/src/zapit/src/ci.cpp @@ -125,7 +125,7 @@ unsigned int CCaPmt::writeToBuffer(unsigned char * const buffer, int demux, int { unsigned int i; - memcpy(buffer, "\x9f\x80\x32\x82\x00\x00", 6); + memmove(buffer, "\x9f\x80\x32\x82\x00\x00", 6); buffer[6] = ca_pmt_list_management; //6 buffer[7] = program_number >> 8; //7 diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp index d8bc310fa..39662bff8 100644 --- a/src/zapit/src/frontend.cpp +++ b/src/zapit/src/frontend.cpp @@ -1047,8 +1047,8 @@ int CFrontend::tuneFrequency(FrontendParameters * feparams, uint8_t polarization TP_params TP; printf("[fe%d] tune to frequency %d pol %s srate %d\n", fenumber, feparams->frequency, polarization ? "Vertical/Right" : "Horizontal/Left", feparams->u.qpsk.symbol_rate); - memcpy(&curfe, feparams, sizeof(struct dvb_frontend_parameters)); - memcpy(&TP.feparams, feparams, sizeof(struct dvb_frontend_parameters)); + memmove(&curfe, feparams, sizeof(struct dvb_frontend_parameters)); + memmove(&TP.feparams, feparams, sizeof(struct dvb_frontend_parameters)); TP.polarization = polarization; return setParameters(&TP, nowait); @@ -1103,7 +1103,7 @@ int CFrontend::setParameters(TP_params *TP, bool /*nowait*/) /* if everything went ok, then it is a good idea to copy the real * frontend parameters, so we can update the service list, if it differs. * TODO: set a flag to indicate a change in the service list */ - memcpy(¤tTransponder.feparams, &event.parameters, sizeof(struct dvb_frontend_parameters)); + memmove(¤tTransponder.feparams, &event.parameters, sizeof(struct dvb_frontend_parameters)); } #endif diff --git a/src/zapit/src/pmt.cpp b/src/zapit/src/pmt.cpp index a9c95b56e..81fe3c733 100644 --- a/src/zapit/src/pmt.cpp +++ b/src/zapit/src/pmt.cpp @@ -148,7 +148,7 @@ printf("descr 0x0A: %02X %02X %02X\n", buffer[pos+2], buffer[pos+3], buffer[pos+ //printf("[pmt] teletext pid %x: %s\n", esInfo->elementary_PID, tmp_Lang); printf("[pmt] teletext pid %x\n", esInfo->elementary_PID); for (unsigned char fIdx = 0; fIdx < fieldCount; fIdx++) { - memcpy(tmp_Lang, &buffer[pos + 5*fIdx + 2], 3); + memmove(tmp_Lang, &buffer[pos + 5*fIdx + 2], 3); tmp_Lang[3] = '\0'; unsigned char teletext_type=buffer[pos + 5*fIdx + 5]>> 3; unsigned char teletext_magazine_number = buffer[pos + 5*fIdx + 5] & 7; @@ -174,7 +174,7 @@ printf("[pmt] teletext type %d mag %d page %d lang %s\n", teletext_type, teletex unsigned char fieldCount1=descriptor_length/8; for (unsigned char fIdx=0;fIdxsetCaPmt(caPmt); unsigned char * p = new unsigned char[pmtlen]; - memcpy(p, buffer, pmtlen); + memmove(p, buffer, pmtlen); channel->setRawPmt(p, pmtlen); } #if 0 diff --git a/src/zapit/src/udpstreampes.cpp b/src/zapit/src/udpstreampes.cpp index 223f9279c..9796fb766 100644 --- a/src/zapit/src/udpstreampes.cpp +++ b/src/zapit/src/udpstreampes.cpp @@ -779,7 +779,7 @@ int main () for (v=0; vPacket = SPkt.WritePkt++; PacketHeader->Status = 0; @@ -811,7 +811,7 @@ int main () PacketHeader->Stream = u; PacketHeader->StreamPacket = Stream[u].ReadPkt++; WritePtr += sizeof(PacketHeaderType); - memcpy ( WritePtr, ReadPtr, NET_DATA_PER_PACKET ); + memmove ( WritePtr, ReadPtr, NET_DATA_PER_PACKET ); ReadPtr += NET_DATA_PER_PACKET; WritePtr += NET_DATA_PER_PACKET; CheckNextSPktWriteBuf( );