enum class fixups - testing non-zero

services/files/directory_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/files/directory_impl.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
@@ skipping 169 matching lines @@
                           const TouchCallback& callback) {
   DCHECK(dir_fd_.is_valid());
   TouchFD(dir_fd_.get(), atime.Pass(), mtime.Pass(), callback);
 }
 
 // TODO(vtl): Move the implementation to a thread pool.
 void DirectoryImpl::OpenFile(const String& path,
                              InterfaceRequest<File> file,
                              uint32_t open_flags,
                              const OpenFileCallback& callback) {
+  Error error;
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  if ((error = IsPathValid(path)) != ERROR_OK) {

[viettrungluu, 2015/09/22 22:04:58]

I think I'd prefer if you just did:

Error error = IsPathValid(path);
if (error != ERROR_OK) {
...

(and similarly below, omitting "Error" where "error" has already been declared).

[johngro, 2015/09/22 22:24:12]

Done.

     callback.Run(error);
     return;
   }
   // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
   // TODO(vtl): Maybe allow absolute paths?
 
-  if (Error error = ValidateOpenFlags(open_flags, false)) {
+  if ((error = ValidateOpenFlags(open_flags, false)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   int flags = 0;
   if ((open_flags & kOpenFlagRead))
     flags |= (open_flags & kOpenFlagWrite) ? O_RDWR : O_RDONLY;
   else
     flags |= O_WRONLY;
   if ((open_flags & kOpenFlagCreate))
@@ skipping 14 matching lines @@
 
   if (file.is_pending())
     new FileImpl(file.Pass(), file_fd.Pass());
   callback.Run(ERROR_OK);
 }
 
 void DirectoryImpl::OpenDirectory(const String& path,
                                   InterfaceRequest<Directory> directory,
                                   uint32_t open_flags,
                                   const OpenDirectoryCallback& callback) {
+  Error error;
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  if ((error = IsPathValid(path)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): Make sure the path doesn't exit this directory (if appropriate).
   // TODO(vtl): Maybe allow absolute paths?
 
-  if (Error error = ValidateOpenFlags(open_flags, false)) {
+  if ((error = ValidateOpenFlags(open_flags, false)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // TODO(vtl): Implement read-only (whatever that means).
   if (!(open_flags & kOpenFlagWrite)) {
     callback.Run(ERROR_UNIMPLEMENTED);
     return;
   }
 
@@ skipping 17 matching lines @@
   }
 
   if (directory.is_pending())
     new DirectoryImpl(directory.Pass(), new_dir_fd.Pass(), nullptr);
   callback.Run(ERROR_OK);
 }
 
 void DirectoryImpl::Rename(const String& path,
                            const String& new_path,
                            const RenameCallback& callback) {
+  Error error;
   DCHECK(!path.is_null());
   DCHECK(!new_path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  if ((error = IsPathValid(path)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
-  if (Error error = IsPathValid(new_path)) {
+  if ((error = IsPathValid(new_path)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): See TODOs about |path| in OpenFile().
 
   if (renameat(dir_fd_.get(), path.get().c_str(), dir_fd_.get(),
                new_path.get().c_str())) {
     callback.Run(ErrnoToError(errno));
     return;
   }
 
   callback.Run(ERROR_OK);
 }
 
 void DirectoryImpl::Delete(const String& path,
                            uint32_t delete_flags,
                            const DeleteCallback& callback) {
+  Error error;
   DCHECK(!path.is_null());
   DCHECK(dir_fd_.is_valid());
 
-  if (Error error = IsPathValid(path)) {
+  if ((error = IsPathValid(path)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
   // TODO(vtl): See TODOs about |path| in OpenFile().
 
-  if (Error error = ValidateDeleteFlags(delete_flags)) {
+  if ((error = ValidateDeleteFlags(delete_flags)) != ERROR_OK) {
     callback.Run(error);
     return;
   }
 
   // TODO(vtl): Recursive not yet supported.
   if ((delete_flags & kDeleteFlagRecursive)) {
     callback.Run(ERROR_UNIMPLEMENTED);
     return;
   }
 
@@ skipping 15 matching lines @@
   if (unlinkat(dir_fd_.get(), path.get().c_str(), AT_REMOVEDIR) == 0) {
     callback.Run(ERROR_OK);
     return;
   }
 
   callback.Run(ErrnoToError(errno));
 }
 
 }  // namespace files
 }  // namespace mojo