Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4799eba authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Todd Kennedy
Browse files

idmap2: fix cpplint warnings 

Fix the following to make cpplint happy again:

  - Use C++ style casts
  - Rename a few header guards
  - Add missing includes of standard C++ headers
  - Add comments to the end of namespaces

Also, for consistency, always use "..." instead of <...> for local
include files, i.e.

  #include "idmap2/.*"

Test: cmds/idmap2/static-checks.sh
Change-Id: Ie735a36d562d1fc51b61f1f0f45aec0d160f602d
parent 1f9a5ed4

cmds/idmap2/idmap2/Create.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <fstream>

#include <memory>

#include <ostream>

#include <string>

#include <vector>



#include "androidfw/ResourceTypes.h"

cmds/idmap2/idmap2/CreateMultiple.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <fstream>

#include <memory>

#include <ostream>

#include <string>

#include <vector>



#include "Commands.h"

cmds/idmap2/idmap2d/Idmap2Service.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef IDMAP2_IDMAP2D_IDMAP2SERVICE_H_

#define IDMAP2_IDMAP2D_IDMAP2SERVICE_H_



#include <string>



#include <android-base/unique_fd.h>

#include <binder/BinderService.h>

#include <binder/Nullable.h>

cmds/idmap2/libidmap2/PolicyUtils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include "include/idmap2/PolicyUtils.h"



#include <sstream>

#include <string>

#include <vector>



#include "android-base/strings.h"

#include "idmap2/Policies.h"

cmds/idmap2/libidmap2_policies/include/idmap2/Policies.h

+4 −3
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
 * limitations under the License.

 */



#ifndef IDMAP2_INCLUDE_IDMAP2_POLICIES_H_

#define IDMAP2_INCLUDE_IDMAP2_POLICIES_H_

#ifndef IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_

#define IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_



#include <array>

#include <string>

#include <utility>

#include <vector>



#include "android-base/stringprintf.h"
@@ -76,4 +77,4 @@ inline static std::string PoliciesToDebugString(PolicyBitmask policies) { 


}  // namespace android::idmap2::policy



#endif  // IDMAP2_INCLUDE_IDMAP2_POLICIES_H_
 
#endif  // IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_