mawww/kakoune
1
1
Fork 0
mirror of https://github.com/mawww/kakoune.git synced 2024-12-19 09:21:30 +03:00
Code Issues Projects Releases Wiki Activity

Minor code cleanups

Browse Source
This commit is contained in:
Maxime Coste 2013-07-28 16:40:02 +02:00
parent 5dfd4a9869
commit af8e8d27d4
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command_manager.cc
View File

@ -31,9 +31,11 @@ void CommandManager::register_commands(memoryview<String> command_names,
m_commands[command_name] = { command, completer };
}
parse_error::parse_error(const String& error)
struct parse_error : runtime_error
{
parse_error(const String& error)
: runtime_error{"parse error: " + error} {}
};
namespace
{

8
src/command_manager.hh
View File

@ -14,15 +14,9 @@
namespace Kakoune
{
struct parse_error : runtime_error
{
parse_error(const String& error);
};
struct Context;
using CommandParameters = memoryview<String>;
using Command = std::function<void (CommandParameters,
Context& context)>;
using Command = std::function<void (CommandParameters, Context& context)>;
using CommandCompleter = std::function<CandidateList (const Context& context,
CommandParameters,
size_t, ByteCount)>;

2
src/main.cc
View File

@ -43,7 +43,7 @@ String runtime_directory()
#elif defined(__APPLE__)
uint32_t bufsize = 2048;
_NSGetExecutablePath(buffer, &bufsize);
char* canonical_path = realpath(buffer, NULL);
char* canonical_path = realpath(buffer, nullptr);
strncpy(buffer, canonical_path, 2048);
free(canonical_path);
#else

4
src/remote.cc
View File

@ -327,7 +327,7 @@ bool RemoteUI::is_key_available()
tv.tv_sec = 0;
tv.tv_usec = 0;
int res = select(sock+1, &rfds, NULL, NULL, &tv);
int res = select(sock+1, &rfds, nullptr, nullptr, &tv);
return res == 1;
}
@ -500,7 +500,7 @@ private:
FD_ZERO(&rfds);
FD_SET(socket, &rfds);
}
while (select(socket+1, &rfds, NULL, NULL, &tv) == 1);
while (select(socket+1, &rfds, nullptr, nullptr, &tv) == 1);
}
String m_buffer;

4
src/shell_manager.cc
View File

@ -67,7 +67,7 @@ String ShellManager::pipe(const String& input,
if (not errorout.empty())
write_debug("shell stderr: <<<\n" + errorout + ">>>");
waitpid(pid, NULL, 0);
waitpid(pid, nullptr, 0);
}
else try
{
@ -125,7 +125,7 @@ String ShellManager::pipe(const String& input,
execparams.push_back(shell.c_str());
for (auto& param : params)
execparams.push_back(param.c_str());
execparams.push_back(NULL);
execparams.push_back(nullptr);
execvp(shell.c_str(), (char* const*)execparams.data());
exit(-1);