diff options
| -rw-r--r-- | base/clipboard_linux.cc | 14 | ||||
| -rw-r--r-- | base/file_util.cc | 2 | ||||
| -rw-r--r-- | base/process_util_linux.cc | 4 | ||||
| -rw-r--r-- | base/process_util_posix.cc | 4 |
4 files changed, 13 insertions, 11 deletions
diff --git a/base/clipboard_linux.cc b/base/clipboard_linux.cc index ce53902..d5195b4 100644 --- a/base/clipboard_linux.cc +++ b/base/clipboard_linux.cc @@ -10,15 +10,16 @@ #include <string> #include <utility> +#include "base/scoped_ptr.h" #include "base/linux_util.h" #include "base/string_util.h" namespace { -const char* kMimeBmp = "image/bmp"; -const char* kMimeHtml = "text/html"; -const char* kMimeText = "text/plain"; -const char* kMimeWebkitSmartPaste = "chromium-internal/webkit-paste"; +const char kMimeBmp[] = "image/bmp"; +const char kMimeHtml[] = "text/html"; +const char kMimeText[] = "text/plain"; +const char kMimeWebkitSmartPaste[] = "chromium-internal/webkit-paste"; std::string GdkAtomToString(const GdkAtom& atom) { gchar* name = gdk_atom_name(atom); @@ -126,7 +127,8 @@ void Clipboard::WriteObjects(const ObjectMap& objects) { // Take ownership of the GTK clipboard and inform it of the targets we support. void Clipboard::SetGtkClipboard() { - GtkTargetEntry targets[clipboard_data_->size()]; + scoped_array<GtkTargetEntry> targets( + new GtkTargetEntry[clipboard_data_->size()]); int i = 0; for (Clipboard::TargetMap::iterator iter = clipboard_data_->begin(); @@ -138,7 +140,7 @@ void Clipboard::SetGtkClipboard() { targets[i].info = i; } - gtk_clipboard_set_with_data(clipboard_, targets, + gtk_clipboard_set_with_data(clipboard_, targets.get(), clipboard_data_->size(), GetData, ClearData, clipboard_data_); diff --git a/base/file_util.cc b/base/file_util.cc index 65cdf91..f7a0411 100644 --- a/base/file_util.cc +++ b/base/file_util.cc @@ -22,7 +22,7 @@ namespace { const FilePath::CharType kExtensionSeparator = FILE_PATH_LITERAL('.'); -} +} // namespace namespace file_util { diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index faec590..686b04b 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -55,11 +55,11 @@ bool LaunchApp(const std::vector<std::string>& argv, } } - char* argv_cstr[argv.size() + 1]; + scoped_array<char*> argv_cstr(new char*[argv.size() + 1]); for (size_t i = 0; i < argv.size(); i++) argv_cstr[i] = const_cast<char*>(argv[i].c_str()); argv_cstr[argv.size()] = NULL; - execvp(argv_cstr[0], argv_cstr); + execvp(argv_cstr[0], argv_cstr.get()); exit(127); } else { if (wait) diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index 3570a16..562b8e9 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -345,11 +345,11 @@ bool GetAppOutput(const CommandLine& cl, std::string* output) { close(dev_null); const std::vector<std::string> argv = cl.argv(); - char* argv_cstr[argv.size() + 1]; + scoped_array<char*> argv_cstr(new char*[argv.size() + 1]); for (size_t i = 0; i < argv.size(); i++) argv_cstr[i] = const_cast<char*>(argv[i].c_str()); argv_cstr[argv.size()] = NULL; - execvp(argv_cstr[0], argv_cstr); + execvp(argv_cstr[0], argv_cstr.get()); exit(127); } default: // parent |