1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 12:19:02 +00:00

Renamed nmap_fileexistsandisreadable() by file_is_readable(). Former was

hardly readable and is not even a good candidate for longest method
name (http://msdn.microsoft.com/en-us/library/system.windows.media.textformatting.textsource.gettexteffectcharacterindexfromtextsourcecharacterindex.aspx#Y0)
This commit is contained in:
henri
2012-10-20 15:00:10 +00:00
parent 16ea382e9b
commit 1e3115dbcb
6 changed files with 17 additions and 22 deletions

View File

@@ -1517,7 +1517,7 @@ int getinterfaces_inet6_linux(if6_t *ifbuf, int max_ifaces){
outFatal(QT_3,"getinterfaces_inet6_linux() NULL values supplied");
/* TODO: Do we fatal() or should we just error and return OP_FAILURE? */
if ( !fileexistsandisreadable(PATH_PROC_IFINET6) )
if ( !file_is_readable(PATH_PROC_IFINET6) )
outFatal(QT_3, "Couldn't get IPv6 interface information. File %s does not exist or you don't have read permissions.", PATH_PROC_IFINET6);
if( (if6file=fopen(PATH_PROC_IFINET6, "r"))==NULL )
outFatal(QT_3, "Failed to open %s.", PATH_PROC_IFINET6);
@@ -1711,7 +1711,7 @@ int getroutes_inet6_linux(route6_t *rtbuf, int max_routes){
outFatal(QT_3,"getroutes_inet6_linux() NULL values supplied");
/* TODO: Do we fatal() or should we just error and return OP_FAILURE? */
if ( !fileexistsandisreadable(PATH_PROC_IPV6ROUTE) )
if ( !file_is_readable(PATH_PROC_IPV6ROUTE) )
outFatal(QT_3, "Couldn't get IPv6 route information. File %s does not exist or you don't have read permissions.", PATH_PROC_IPV6ROUTE);
if( (route6file=fopen(PATH_PROC_IPV6ROUTE, "r"))==NULL )
outFatal(QT_3, "Failed to open %s.", PATH_PROC_IPV6ROUTE);