From bc25db78fe1bbac61d0457e6cfdfb204f9a61ba9 Mon Sep 17 00:00:00 2001 From: "@wu_fan520" Date: Thu, 21 Jul 2022 09:46:28 +0800 Subject: [PATCH] fix variables case Signed-off-by: @wu_fan520 --- .../anonrefaultsnapshotmininterval_fuzzer.cpp | 5 ++--- test/fuzztest/memory/appscore_fuzzer/appscore_fuzzer.cpp | 5 ++--- .../areaanonrefaultthreshold_fuzzer.cpp | 5 ++--- .../memory/availbuffers_fuzzer/availbuffers_fuzzer.cpp | 5 ++--- .../bufferratioparams_fuzzer/bufferratioparams_fuzzer.cpp | 5 ++--- .../memory/compressratio_fuzzer/compressratio_fuzzer.cpp | 5 ++--- .../emptyroundcheckthreshold_fuzzer.cpp | 5 ++--- .../emptyroundskipinterval_fuzzer.cpp | 5 ++--- .../forceshrinkanon_fuzzer/forceshrinkanon_fuzzer.cpp | 7 +++---- .../maxskipinterval_fuzzer/maxskipinterval_fuzzer.cpp | 5 ++--- test/fuzztest/memory/name_fuzzer/name_fuzzer.cpp | 5 ++--- .../ubufs2zramratio_fuzzer/ubufs2zramratio_fuzzer.cpp | 5 ++--- .../zramcriticalthreshold_fuzzer.cpp | 5 ++--- .../memory/zramwmratio_fuzzer/zramwmratio_fuzzer.cpp | 5 ++--- .../zswapdmaxreclaimsize_fuzzer.cpp | 5 ++--- .../zswapdmemcgsparam_fuzzer/zswapdmemcgsparam_fuzzer.cpp | 5 ++--- .../zswapdpressureshow_fuzzer.cpp | 5 ++--- .../zswapdsinglememcgparam_fuzzer.cpp | 5 ++--- .../sched/beginframefreq_fuzzer/beginframefreq_fuzzer.cpp | 6 +++--- test/fuzztest/sched/setmargin_fuzzer/setmargin_fuzzer.cpp | 6 +++--- 20 files changed, 43 insertions(+), 61 deletions(-) diff --git a/test/fuzztest/memory/anonrefaultsnapshotmininterval_fuzzer/anonrefaultsnapshotmininterval_fuzzer.cpp b/test/fuzztest/memory/anonrefaultsnapshotmininterval_fuzzer/anonrefaultsnapshotmininterval_fuzzer.cpp index fe4f842..b01933f 100644 --- a/test/fuzztest/memory/anonrefaultsnapshotmininterval_fuzzer/anonrefaultsnapshotmininterval_fuzzer.cpp +++ b/test/fuzztest/memory/anonrefaultsnapshotmininterval_fuzzer/anonrefaultsnapshotmininterval_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ANON_REFAULT_SNAPSHOT_MIN_INTERVAL = "/dev/memcg/memory.anon_refault_snapshot_min_interval"; - namespace OHOS { bool AnonRefaultSnapshotMinIntervalFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ANON_REFAULT_SNAPSHOT_MIN_INTERVAL); + const char *anon_refault_snapshot_min_interval = "/dev/memcg/memory.anon_refault_snapshot_min_interval"; + bool ret = MemoryFuzzTest(data, size, anon_refault_snapshot_min_interval); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/appscore_fuzzer/appscore_fuzzer.cpp b/test/fuzztest/memory/appscore_fuzzer/appscore_fuzzer.cpp index e480ac3..1776020 100644 --- a/test/fuzztest/memory/appscore_fuzzer/appscore_fuzzer.cpp +++ b/test/fuzztest/memory/appscore_fuzzer/appscore_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *APP_SCORE = "/dev/memcg/memory.app_score"; - namespace OHOS { bool AppScoreFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, APP_SCORE); + const char *app_score = "/dev/memcg/memory.app_score"; + bool ret = MemoryFuzzTest(data, size, app_score); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/areaanonrefaultthreshold_fuzzer/areaanonrefaultthreshold_fuzzer.cpp b/test/fuzztest/memory/areaanonrefaultthreshold_fuzzer/areaanonrefaultthreshold_fuzzer.cpp index 8fb0d18..9d34c76 100644 --- a/test/fuzztest/memory/areaanonrefaultthreshold_fuzzer/areaanonrefaultthreshold_fuzzer.cpp +++ b/test/fuzztest/memory/areaanonrefaultthreshold_fuzzer/areaanonrefaultthreshold_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *AREA_ANON_REFAULT_THRESHOLD = "/dev/memcg/memory.area_anon_refault_threshold"; - namespace OHOS { bool AreaAnonRefaultThresholdFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, AREA_ANON_REFAULT_THRESHOLD); + const char *area_anon_refault_threshold = "/dev/memcg/memory.area_anon_refault_threshold"; + bool ret = MemoryFuzzTest(data, size, area_anon_refault_threshold); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/availbuffers_fuzzer/availbuffers_fuzzer.cpp b/test/fuzztest/memory/availbuffers_fuzzer/availbuffers_fuzzer.cpp index 03bc523..7baf485 100644 --- a/test/fuzztest/memory/availbuffers_fuzzer/availbuffers_fuzzer.cpp +++ b/test/fuzztest/memory/availbuffers_fuzzer/availbuffers_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *AVAIL_BUFFERS = "/dev/memcg/memory.avail_buffers"; - namespace OHOS { bool AvailBuffersFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, AVAIL_BUFFERS); + const char *avail_buffers = "/dev/memcg/memory.avail_buffers"; + bool ret = MemoryFuzzTest(data, size, avail_buffers); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/bufferratioparams_fuzzer/bufferratioparams_fuzzer.cpp b/test/fuzztest/memory/bufferratioparams_fuzzer/bufferratioparams_fuzzer.cpp index daca18e..e74be40 100644 --- a/test/fuzztest/memory/bufferratioparams_fuzzer/bufferratioparams_fuzzer.cpp +++ b/test/fuzztest/memory/bufferratioparams_fuzzer/bufferratioparams_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *BUFFER_RATIO_PARAMS = "/dev/memcg/memory.buffer_ratio_params"; - namespace OHOS { bool BufferRatioParamsFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, BUFFER_RATIO_PARAMS); + const char *buffer_ratio_params = "/dev/memcg/memory.buffer_ratio_params"; + bool ret = MemoryFuzzTest(data, size, buffer_ratio_params); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/compressratio_fuzzer/compressratio_fuzzer.cpp b/test/fuzztest/memory/compressratio_fuzzer/compressratio_fuzzer.cpp index 5f629c7..0eea7b1 100644 --- a/test/fuzztest/memory/compressratio_fuzzer/compressratio_fuzzer.cpp +++ b/test/fuzztest/memory/compressratio_fuzzer/compressratio_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *COMPRESS_RATIO = "/dev/memcg/memory.compress_ratio"; - namespace OHOS { bool CompressRatioFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, COMPRESS_RATIO); + const char *compress_ratio = "/dev/memcg/memory.compress_ratio"; + bool ret = MemoryFuzzTest(data, size, compress_ratio); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/emptyroundcheckthreshold_fuzzer/emptyroundcheckthreshold_fuzzer.cpp b/test/fuzztest/memory/emptyroundcheckthreshold_fuzzer/emptyroundcheckthreshold_fuzzer.cpp index 7f58665..268aaf2 100644 --- a/test/fuzztest/memory/emptyroundcheckthreshold_fuzzer/emptyroundcheckthreshold_fuzzer.cpp +++ b/test/fuzztest/memory/emptyroundcheckthreshold_fuzzer/emptyroundcheckthreshold_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *EMPTY_ROUND_CHECK_THRESHOLD = "/dev/memcg/memory.empty_round_check_threshold"; - namespace OHOS { bool EmptyRoundCheckThresholdFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, EMPTY_ROUND_CHECK_THRESHOLD); + const char *empty_round_check_threshold = "/dev/memcg/memory.empty_round_check_threshold"; + bool ret = MemoryFuzzTest(data, size, empty_round_check_threshold); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/emptyroundskipinterval_fuzzer/emptyroundskipinterval_fuzzer.cpp b/test/fuzztest/memory/emptyroundskipinterval_fuzzer/emptyroundskipinterval_fuzzer.cpp index 4cc1b48..d053ace 100644 --- a/test/fuzztest/memory/emptyroundskipinterval_fuzzer/emptyroundskipinterval_fuzzer.cpp +++ b/test/fuzztest/memory/emptyroundskipinterval_fuzzer/emptyroundskipinterval_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *EMPTY_ROUND_SKIP_INTERVAL = "/dev/memcg/memory.empty_round_skip_interval"; - namespace OHOS { bool EmptyRoundSkipIntervalFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, EMPTY_ROUND_SKIP_INTERVAL); + const char *empty_round_skip_interval = "/dev/memcg/memory.empty_round_skip_interval"; + bool ret = MemoryFuzzTest(data, size, empty_round_skip_interval); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/forceshrinkanon_fuzzer/forceshrinkanon_fuzzer.cpp b/test/fuzztest/memory/forceshrinkanon_fuzzer/forceshrinkanon_fuzzer.cpp index d5c532c..9dcaa00 100644 --- a/test/fuzztest/memory/forceshrinkanon_fuzzer/forceshrinkanon_fuzzer.cpp +++ b/test/fuzztest/memory/forceshrinkanon_fuzzer/forceshrinkanon_fuzzer.cpp @@ -20,19 +20,18 @@ #include #include "memorycommon.h" -const char *FORCE_SHRINK_ANON = "/dev/memcg/memory.force_shrink_anon"; - namespace OHOS { bool ForceShrinkAnonFuzzer(const uint8_t *data, size_t size) { - int fd = open(FORCE_SHRINK_ANON, O_RDWR); + const char *force_shrink_anon = "/dev/memcg/memory.force_shrink_anon"; + int fd = open(force_shrink_anon, O_RDWR); if (fd < 0) { return false; } int ret = write(fd, data, size); if (ret < 0) { - printf("%s write fail\n", FORCE_SHRINK_ANON); + printf("%s write fail\n", force_shrink_anon); close(fd); return false; } diff --git a/test/fuzztest/memory/maxskipinterval_fuzzer/maxskipinterval_fuzzer.cpp b/test/fuzztest/memory/maxskipinterval_fuzzer/maxskipinterval_fuzzer.cpp index a185c33..d5e8c15 100644 --- a/test/fuzztest/memory/maxskipinterval_fuzzer/maxskipinterval_fuzzer.cpp +++ b/test/fuzztest/memory/maxskipinterval_fuzzer/maxskipinterval_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *MAX_SKIP_INTERVAL = "/dev/memcg/memory.max_skip_interval"; - namespace OHOS { bool MaxSkipIntervalFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, MAX_SKIP_INTERVAL); + const char *max_skip_interval = "/dev/memcg/memory.max_skip_interval"; + bool ret = MemoryFuzzTest(data, size, max_skip_interval); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/name_fuzzer/name_fuzzer.cpp b/test/fuzztest/memory/name_fuzzer/name_fuzzer.cpp index 272a44f..9311f4d 100644 --- a/test/fuzztest/memory/name_fuzzer/name_fuzzer.cpp +++ b/test/fuzztest/memory/name_fuzzer/name_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *NAME = "/dev/memcg/memory.name"; - namespace OHOS { bool NameFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, NAME); + const char *name = "/dev/memcg/memory.name"; + bool ret = MemoryFuzzTest(data, size, name); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/ubufs2zramratio_fuzzer/ubufs2zramratio_fuzzer.cpp b/test/fuzztest/memory/ubufs2zramratio_fuzzer/ubufs2zramratio_fuzzer.cpp index 0a8b80a..505e8d0 100644 --- a/test/fuzztest/memory/ubufs2zramratio_fuzzer/ubufs2zramratio_fuzzer.cpp +++ b/test/fuzztest/memory/ubufs2zramratio_fuzzer/ubufs2zramratio_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *UB_UFS2ZRAM_RATIO = "/dev/memcg/memory.ub_ufs2zram_ratio"; - namespace OHOS { bool UbUfs2zramRatioFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, UB_UFS2ZRAM_RATIO); + const char *ub_ufs2zram_ratio = "/dev/memcg/memory.ub_ufs2zram_ratio"; + bool ret = MemoryFuzzTest(data, size, ub_ufs2zram_ratio); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zramcriticalthreshold_fuzzer/zramcriticalthreshold_fuzzer.cpp b/test/fuzztest/memory/zramcriticalthreshold_fuzzer/zramcriticalthreshold_fuzzer.cpp index 226a5f3..32c4692 100644 --- a/test/fuzztest/memory/zramcriticalthreshold_fuzzer/zramcriticalthreshold_fuzzer.cpp +++ b/test/fuzztest/memory/zramcriticalthreshold_fuzzer/zramcriticalthreshold_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZRAM_CRITICAL_THRESHOLD = "/dev/memcg/memory.zram_critical_threshold"; - namespace OHOS { bool ZramCriticalThresholdFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZRAM_CRITICAL_THRESHOLD); + const char *zram_critical_threshold = "/dev/memcg/memory.zram_critical_threshold"; + bool ret = MemoryFuzzTest(data, size, zram_critical_threshold); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zramwmratio_fuzzer/zramwmratio_fuzzer.cpp b/test/fuzztest/memory/zramwmratio_fuzzer/zramwmratio_fuzzer.cpp index 4e78fd5..8bd4d17 100644 --- a/test/fuzztest/memory/zramwmratio_fuzzer/zramwmratio_fuzzer.cpp +++ b/test/fuzztest/memory/zramwmratio_fuzzer/zramwmratio_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZRAM_WR_RATIO = "/dev/memcg/memory.zram_wm_ratio"; - namespace OHOS { bool ZramWmRatioFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZRAM_WR_RATIO); + const char *zram_wr_ratio = "/dev/memcg/memory.zram_wm_ratio"; + bool ret = MemoryFuzzTest(data, size, zram_wr_ratio); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zswapdmaxreclaimsize_fuzzer/zswapdmaxreclaimsize_fuzzer.cpp b/test/fuzztest/memory/zswapdmaxreclaimsize_fuzzer/zswapdmaxreclaimsize_fuzzer.cpp index 0d8ca27..2c43294 100644 --- a/test/fuzztest/memory/zswapdmaxreclaimsize_fuzzer/zswapdmaxreclaimsize_fuzzer.cpp +++ b/test/fuzztest/memory/zswapdmaxreclaimsize_fuzzer/zswapdmaxreclaimsize_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZSWAPD_MAX_RECLAIM_SIZE = "/dev/memcg/memory.zswapd_max_reclaim_size"; - namespace OHOS { bool ZswapdMaxReclaimSizeFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZSWAPD_MAX_RECLAIM_SIZE); + const char *zswapd_max_reclaim_size = "/dev/memcg/memory.zswapd_max_reclaim_size"; + bool ret = MemoryFuzzTest(data, size, zswapd_max_reclaim_size); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zswapdmemcgsparam_fuzzer/zswapdmemcgsparam_fuzzer.cpp b/test/fuzztest/memory/zswapdmemcgsparam_fuzzer/zswapdmemcgsparam_fuzzer.cpp index e43e324..b6820c0 100644 --- a/test/fuzztest/memory/zswapdmemcgsparam_fuzzer/zswapdmemcgsparam_fuzzer.cpp +++ b/test/fuzztest/memory/zswapdmemcgsparam_fuzzer/zswapdmemcgsparam_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZSWAPD_MEMCGS_PARAM = "/dev/memcg/memory.zswapd_memcgs_param"; - namespace OHOS { bool ZswapdMemcgsParamFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZSWAPD_MEMCGS_PARAM); + const char *zswapd_memcgs_param = "/dev/memcg/memory.zswapd_memcgs_param"; + bool ret = MemoryFuzzTest(data, size, zswapd_memcgs_param); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zswapdpressureshow_fuzzer/zswapdpressureshow_fuzzer.cpp b/test/fuzztest/memory/zswapdpressureshow_fuzzer/zswapdpressureshow_fuzzer.cpp index 81b8e7c..c6d423e 100644 --- a/test/fuzztest/memory/zswapdpressureshow_fuzzer/zswapdpressureshow_fuzzer.cpp +++ b/test/fuzztest/memory/zswapdpressureshow_fuzzer/zswapdpressureshow_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZSWAPD_PRESSURE_SHOW = "/dev/memcg/memory.zswapd_pressure_show"; - namespace OHOS { bool ZswapdPressureShowFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZSWAPD_PRESSURE_SHOW); + const char *zswapd_pressure_show = "/dev/memcg/memory.zswapd_pressure_show"; + bool ret = MemoryFuzzTest(data, size, zswapd_pressure_show); return ret; } } // namespace OHOS diff --git a/test/fuzztest/memory/zswapdsinglememcgparam_fuzzer/zswapdsinglememcgparam_fuzzer.cpp b/test/fuzztest/memory/zswapdsinglememcgparam_fuzzer/zswapdsinglememcgparam_fuzzer.cpp index 954f44a..4966fa1 100644 --- a/test/fuzztest/memory/zswapdsinglememcgparam_fuzzer/zswapdsinglememcgparam_fuzzer.cpp +++ b/test/fuzztest/memory/zswapdsinglememcgparam_fuzzer/zswapdsinglememcgparam_fuzzer.cpp @@ -17,12 +17,11 @@ #include #include "memorycommon.h" -const char *ZSWAPD_SINGLE_MEMCG_PARAM = "/dev/memcg/memory.zswapd_single_memcg_param"; - namespace OHOS { bool ZswapdSingleMemcgParamFuzzer(const uint8_t *data, size_t size) { - bool ret = MemoryFuzzTest(data, size, ZSWAPD_SINGLE_MEMCG_PARAM); + const char *zswapd_single_memcg_param = "/dev/memcg/memory.zswapd_single_memcg_param"; + bool ret = MemoryFuzzTest(data, size, zswapd_single_memcg_param); return ret; } } // namespace OHOS diff --git a/test/fuzztest/sched/beginframefreq_fuzzer/beginframefreq_fuzzer.cpp b/test/fuzztest/sched/beginframefreq_fuzzer/beginframefreq_fuzzer.cpp index 023a325..bf0f9d6 100644 --- a/test/fuzztest/sched/beginframefreq_fuzzer/beginframefreq_fuzzer.cpp +++ b/test/fuzztest/sched/beginframefreq_fuzzer/beginframefreq_fuzzer.cpp @@ -25,14 +25,14 @@ namespace OHOS { bool BeginFrameFreqFuzzTest(const uint8_t *data, size_t size) { bool ret = false; - constexpr int MARGIN_UPPER_LIMIT_TIME = 32000; - constexpr int MARGIN_LOWER_LIMIT_TIME = -32000; + constexpr int margin_upper_limit_time = 32000; + constexpr int margin_lower_limit_time = -32000; if (data == nullptr) { return ret; } else { uint8_t *countData = const_cast(data); int margin = *(reinterpret_cast(countData)); - if (margin < MARGIN_LOWER_LIMIT_TIME || margin > MARGIN_UPPER_LIMIT_TIME) { + if (margin < margin_lower_limit_time || margin > margin_upper_limit_time) { return ret; } int grpId = 2; diff --git a/test/fuzztest/sched/setmargin_fuzzer/setmargin_fuzzer.cpp b/test/fuzztest/sched/setmargin_fuzzer/setmargin_fuzzer.cpp index 4b92d3f..ceddac4 100644 --- a/test/fuzztest/sched/setmargin_fuzzer/setmargin_fuzzer.cpp +++ b/test/fuzztest/sched/setmargin_fuzzer/setmargin_fuzzer.cpp @@ -25,14 +25,14 @@ namespace OHOS { bool SetMarginFuzzTest(const uint8_t *data, size_t size) { bool ret = false; - constexpr int MARGIN_UPPER_LIMIT_TIME = 32000; - constexpr int MARGIN_LOWER_LIMIT_TIME = -32000; + constexpr int margin_upper_limit_time = 32000; + constexpr int margin_lower_limit_time = -32000; if (data == nullptr) { return ret; } else { uint8_t *countData = const_cast(data); int margin = *(reinterpret_cast(countData)); - if (margin < MARGIN_LOWER_LIMIT_TIME || margin > MARGIN_UPPER_LIMIT_TIME) { + if (margin < margin_lower_limit_time || margin > margin_upper_limit_time) { return ret; } int grpId = 2; -- Gitee