1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-09 22:21:29 +00:00

merge soc07 r4871:4884 and r4888 - renaming __FUNCTION__ to __func__ and changing hardcoded func names to __func__

This commit is contained in:
fyodor
2007-08-11 04:06:09 +00:00
parent 1540fe57c4
commit 8d74bbcd8a
23 changed files with 4328 additions and 3936 deletions

View File

@@ -338,7 +338,7 @@ unsigned char *tmp;
int bpe;
if (sizeof(unsigned char) != 1)
fatal("genfry() requires 1 byte chars");
fatal("%s() requires 1 byte chars", __func__);
if (num_elem < 2)
return;
@@ -1059,8 +1059,8 @@ char *mmapfile(char *fname, int *length, int openflags)
CloseHandle (fd);
if (o.debugging > 2)
printf ("mmapfile(): fd %08lX, gmap %08lX, fileptr %08lX, length %d\n",
(DWORD)fd, (DWORD)gmap, (DWORD)fileptr, *length);
printf ("%s(): fd %08lX, gmap %08lX, fileptr %08lX, length %d\n",
__func__, (DWORD)fd, (DWORD)gmap, (DWORD)fileptr, *length);
return fileptr;
}
@@ -1071,7 +1071,7 @@ char *mmapfile(char *fname, int *length, int openflags)
int win32_munmap(char *filestr, int filelen)
{
if (gmap == 0)
fatal("win32_munmap: no current mapping !\n");
fatal("%s: no current mapping !\n", __func__);
FlushViewOfFile(filestr, filelen);
UnmapViewOfFile(filestr);