From 036d28c898ade4ac49ef03b34c9a731c4b533736 Mon Sep 17 00:00:00 2001 From: batrick Date: Tue, 7 Aug 2012 17:25:49 +0000 Subject: [PATCH] Remove nmap.sleep as we just want to have stdnse.sleep. --- nse_nmaplib.cc | 4 ---- nselib/stdnse.lua | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/nse_nmaplib.cc b/nse_nmaplib.cc index 94de0685f..eff9d6d09 100644 --- a/nse_nmaplib.cc +++ b/nse_nmaplib.cc @@ -939,7 +939,6 @@ int luaopen_nmap (lua_State *L) {"new_dnet", nseU_placeholder}, /* imported from nmap.dnet */ {"get_interface_info", nseU_placeholder}, /* imported from nmap.dnet */ {"new_socket", nseU_placeholder}, /* imported from nmap.socket */ - {"sleep", nseU_placeholder}, /* imported from nmap.socket */ {"mutex", nseU_placeholder}, /* placeholder */ {"condvar", nseU_placeholder}, /* placeholder */ {NULL, NULL} @@ -965,9 +964,6 @@ int luaopen_nmap (lua_State *L) /* nmap.socket.new -> nmap.new_socket. */ lua_getfield(L, -1, "new"); lua_setfield(L, nmap_idx, "new_socket"); - /* nmap.socket.sleep -> nmap.sleep. */ - lua_getfield(L, -1, "sleep"); - lua_setfield(L, nmap_idx, "sleep"); /* Store nmap.socket; used by nse_main.lua. */ lua_setfield(L, nmap_idx, "socket"); diff --git a/nselib/stdnse.lua b/nselib/stdnse.lua index be251c9a1..87d34d31a 100644 --- a/nselib/stdnse.lua +++ b/nselib/stdnse.lua @@ -50,7 +50,7 @@ _ENV = require "strict" {}; -- @class function -- @param t Time to sleep, in seconds. -- @usage stdnse.sleep(1.5) -_ENV.sleep = nmap.sleep; +_ENV.sleep = nmap.sleep.socket; --- -- Prints a formatted debug message if the current debugging level is greater