From 4b7ef273872516874425356d5a6f218dcafdd505 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Thu, 28 Sep 2017 15:18:37 +0800 Subject: [PATCH] boot_control_copy: switching to C++ fs_mgr_get_entry_for_mount_point() is switching to a C++ only API (using std::string). Do a minimum conversion here to adopt that change. Bug: 67024518 Test: make and boot sailfish Change-Id: I191fd0043815d75a799eb4001437abb107af6e79 --- boot_control_copy/Android.mk | 2 +- boot_control_copy/{boot_control_copy.c => boot_control_copy.cpp} | 0 boot_control_copy/{bootinfo.c => bootinfo.cpp} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename boot_control_copy/{boot_control_copy.c => boot_control_copy.cpp} (100%) rename boot_control_copy/{bootinfo.c => bootinfo.cpp} (98%) diff --git a/boot_control_copy/Android.mk b/boot_control_copy/Android.mk index 3a5f8a08..fecd314c 100644 --- a/boot_control_copy/Android.mk +++ b/boot_control_copy/Android.mk @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_SRC_FILES := boot_control_copy.c bootinfo.c +LOCAL_SRC_FILES := boot_control_copy.cpp bootinfo.cpp LOCAL_CFLAGS := -Wall -Wno-missing-field-initializers -Wno-unused-parameter LOCAL_C_INCLUDES := system/core/mkbootimg bootable/recovery LOCAL_SHARED_LIBRARIES := libbase libcutils diff --git a/boot_control_copy/boot_control_copy.c b/boot_control_copy/boot_control_copy.cpp similarity index 100% rename from boot_control_copy/boot_control_copy.c rename to boot_control_copy/boot_control_copy.cpp diff --git a/boot_control_copy/bootinfo.c b/boot_control_copy/bootinfo.cpp similarity index 98% rename from boot_control_copy/bootinfo.c rename to boot_control_copy/bootinfo.cpp index dbc0757c..f21fe843 100644 --- a/boot_control_copy/bootinfo.c +++ b/boot_control_copy/bootinfo.cpp @@ -90,7 +90,7 @@ int boot_info_open_partition(const char *name, uint64_t *out_size, int flags) } trimmed_len = end_slash - record->blk_device + 1; name_len = strlen(name); - path = calloc(trimmed_len + name_len + 1, 1); + path = static_cast(calloc(trimmed_len + name_len + 1, 1)); strncpy(path, record->blk_device, trimmed_len); strncpy(path + trimmed_len, name, name_len); } -- 2.11.0