diff options
| author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
|---|---|---|
| committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
| commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
| tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/src/shell.ccg | |
| parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
| parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
| download | glibmm-0d5f63b18f5766760cf39e82ee11482984e0a938.tar.gz | |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/src/shell.ccg')
| -rw-r--r-- | glib/src/shell.ccg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/src/shell.ccg b/glib/src/shell.ccg index 4950c086..db01f78e 100644 --- a/glib/src/shell.ccg +++ b/glib/src/shell.ccg @@ -25,9 +25,9 @@ namespace Glib Glib::ArrayHandle<std::string> shell_parse_argv(const std::string& command_line) { - char** argv = 0; + char** argv = nullptr; int argc = 0; - GError* error = 0; + GError* error = nullptr; g_shell_parse_argv(command_line.c_str(), &argc, &argv, &error); @@ -45,7 +45,7 @@ std::string shell_quote(const std::string& unquoted_string) std::string shell_unquote(const std::string& quoted_string) { - GError* error = 0; + GError* error = nullptr; char *const buf = g_shell_unquote(quoted_string.c_str(), &error); if(error) |