| OLD | NEW | 
|---|
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "update_engine/filesystem_iterator.h" | 5 #include "update_engine/filesystem_iterator.h" | 
| 6 #include <sys/types.h> | 6 #include <sys/types.h> | 
| 7 #include <dirent.h> | 7 #include <dirent.h> | 
| 8 #include <errno.h> | 8 #include <errno.h> | 
| 9 #include <set> | 9 #include <set> | 
| 10 #include <string> | 10 #include <string> | 
| 11 #include <vector> | 11 #include <vector> | 
| 12 #include "chromeos/obsolete_logging.h" | 12 #include "base/logging.h" | 
| 13 #include "update_engine/utils.h" | 13 #include "update_engine/utils.h" | 
| 14 | 14 | 
| 15 using std::set; | 15 using std::set; | 
| 16 using std::string; | 16 using std::string; | 
| 17 using std::vector; | 17 using std::vector; | 
| 18 | 18 | 
| 19 namespace chromeos_update_engine { | 19 namespace chromeos_update_engine { | 
| 20 | 20 | 
| 21 // We use a macro here for two reasons: | 21 // We use a macro here for two reasons: | 
| 22 // 1. We want to be able to return from the caller's function. | 22 // 1. We want to be able to return from the caller's function. | 
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 138         is_end_ = true; | 138         is_end_ = true; | 
| 139         return; | 139         return; | 
| 140       } | 140       } | 
| 141       CHECK(!names_.empty()); | 141       CHECK(!names_.empty()); | 
| 142       names_.pop_back(); | 142       names_.pop_back(); | 
| 143     } | 143     } | 
| 144   } | 144   } | 
| 145 } | 145 } | 
| 146 | 146 | 
| 147 }  //   namespace chromeos_update_engine | 147 }  //   namespace chromeos_update_engine | 
| OLD | NEW | 
|---|