Skip to content

Commit 6ef4e52

Browse files
shuiqinghshuiqingh
committed
Merge branch 'dev/strict-sign' into 'master' (merge request !51)
fix cpp-lint error continue...
2 parents c262c2c + c574482 commit 6ef4e52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+745
-763
lines changed

‎include/cos_api.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef COS_API_H
2-
#define COS_API_H
1+
#ifndef COS_CPP_SDK_V5_INCLUDE_COS_API_H_
2+
#define COS_CPP_SDK_V5_INCLUDE_COS_API_H_
33

44
#include "op/bucket_op.h"
55
#include "op/cos_result.h"
@@ -1038,4 +1038,4 @@ class CosAPI {
10381038
};
10391039

10401040
} // namespace qcloud_cos
1041-
#endif
1041+
#endif // COS_CPP_SDK_V5_INCLUDE_COS_API_H_

‎include/cos_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef COS_CONFIG_H
2-
#define COS_CONFIG_H
1+
#ifndef COS_CPP_SDK_V5_INCLUDE_COS_CONFIG_H_
2+
#define COS_CPP_SDK_V5_INCLUDE_COS_CONFIG_H_
33

44
#include <stdint.h>
55

@@ -226,4 +226,4 @@ class CosConfig {
226226

227227
typedef std::shared_ptr<CosConfig> SharedConfig;
228228
} // namespace qcloud_cos
229-
#endif
229+
#endif // COS_CPP_SDK_V5_INCLUDE_COS_CONFIG_H_

‎include/cos_defines.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef COS_DEFINE_H
2-
#define COS_DEFINE_H
1+
#ifndef COS_CPP_SDK_V5_INCLUDE_COS_DEFINES_H_
2+
#define COS_CPP_SDK_V5_INCLUDE_COS_DEFINES_H_
33
#include <inttypes.h>
44
#include <stdint.h>
55
#include <stdio.h>
@@ -1240,4 +1240,4 @@ struct ListLiveChannelResult {
12401240
};
12411241

12421242
} // namespace qcloud_cos
1243-
#endif
1243+
#endif // COS_CPP_SDK_V5_INCLUDE_COS_DEFINES_H_

‎include/cos_params.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#ifndef COS_PARAMS_H
2-
#define COS_PARAMS_H
1+
#ifndef COS_CPP_SDK_V5_INCLUDE_COS_PARAMS_H_
2+
#define COS_CPP_SDK_V5_INCLUDE_COS_PARAMS_H_
33

44
#include <string>
55

6-
namespace qcloud_cos{
6+
namespace qcloud_cos {
77

88
/// http header中的Authorization字段
99
const char kHttpHeaderAuthorizatio[] = "Authorization";
@@ -172,4 +172,4 @@ const char kAclBucketOwnerRead[] = "bucket-owner-read";
172172
const char kObjectTypeAppendable[] = "appendable";
173173
const char kObjectTypeNormal[] = "normal";
174174
} // namespace qcloud_cos
175-
#endif
175+
#endif // COS_CPP_SDK_V5_INCLUDE_COS_PARAMS_H_

‎include/cos_sys_config.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef COS_SYS_CONF_H
2-
#define COS_SYS_CONF_H
1+
#ifndef COS_CPP_SDK_V5_INCLUDE_COS_SYS_CONFIG_H_
2+
#define COS_CPP_SDK_V5_INCLUDE_COS_SYS_CONFIG_H_
33
#include <stdint.h>
44

55
#include "cos_defines.h"
@@ -112,14 +112,14 @@ class CosSysConfig {
112112

113113
/// \brief 根据传入appid、region、bucket_name返回对应的hostname
114114
static std::string GetHost(uint64_t app_id, const std::string& region,
115-
const std::string& bucket_name,
115+
const std::string& bucket_name,
116116
bool change_backup_domain = false);
117117

118118
/// \brief 获取CI域名
119119
static std::string GetCIHost(const std::string& bucket_name,
120120
const std::string& region);
121121

122-
/// \brief 获取PIC域名
122+
/// \brief 获取PIC域名
123123
static std::string GetPICHost(uint64_t app_id, const std::string& region,
124124
const std::string& bucket_name);
125125

@@ -217,11 +217,11 @@ class CosSysConfig {
217217
static unsigned m_dns_cache_expire_seconds;
218218
// dns cache大小
219219
static unsigned m_dns_cache_size;
220-
220+
221221
static bool m_retry_change_domain;
222-
222+
223223
static bool m_object_key_simplify_check;
224224
};
225225

226226
} // namespace qcloud_cos
227-
#endif
227+
#endif // COS_CPP_SDK_V5_INCLUDE_COS_SYS_CONFIG_H_

‎include/op/base_op.h‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#pragma once
2+
#ifndef COS_CPP_SDK_V5_INCLUDE_OP_BASE_OP_H_
3+
#define COS_CPP_SDK_V5_INCLUDE_OP_BASE_OP_H_
24

35
#include <inttypes.h>
46
#include <stdint.h>
@@ -46,15 +48,15 @@ class BaseOp {
4648
std::string GetTmpToken() const;
4749

4850
std::string GetDestDomain() const;
49-
51+
5052
bool IsDomainSameToHost() const;
5153

5254
bool UseDefaultDomain() const;
5355

5456
bool IsDefaultHost(const std::string &host) const;
5557

5658
std::string ChangeHostSuffix(const std::string &host);
57-
59+
5860
/// \brief 封装了cos Service/Bucket/Object 相关接口的通用操作,
5961
/// 包括签名计算、请求发送、返回内容解析等
6062
///
@@ -129,3 +131,5 @@ class BaseOp {
129131
};
130132

131133
} // namespace qcloud_cos
134+
135+
#endif // COS_CPP_SDK_V5_INCLUDE_OP_BASE_OP_H_

‎include/op/bucket_op.h‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -529,15 +529,15 @@ class BucketOp : public BaseOp {
529529
/// \param req GetMediainfo请求
530530
/// \param resp GetMediainfo返回
531531
///
532-
/// \return 本次请求的调用情况(如状态码等)
532+
/// \return 本次请求的调用情况(如状态码等)
533533
CosResult GetMediainfo(const GetMediaInfoReq& req, GetMediaInfoResp* resp);
534534

535535
/// \brief 搜索媒体处理队列
536536
/// \brief https://cloud.tencent.com/document/product/436/54045
537537
/// \param req DescribeMediaQueues请求
538538
/// \param resp DescribeMediaQueues返回
539539
///
540-
/// \return 本次请求的调用情况(如状态码等)
540+
/// \return 本次请求的调用情况(如状态码等)
541541
CosResult DescribeMediaQueues(const DescribeMediaQueuesReq& req, DescribeQueuesResp* resp);
542542

543543
/// \brief 更新媒体处理队列
@@ -591,13 +591,13 @@ class BucketOp : public BaseOp {
591591
///
592592
/// \return 本次请求的调用情况(如状态码等)
593593
CosResult DescribeDataProcessJob(const DescribeDataProcessJobReq& req,
594-
DescribeDataProcessJobResp* resp);
594+
DescribeDataProcessJobResp* resp);
595595
/// \brief 图片批量审核
596596
/// \brief https://cloud.tencent.com/document/product/436/63593
597597
/// \param req BatchImageAuditing请求
598598
/// \param resp BatchImageAuditing返回
599599
///
600-
/// \return 本次请求的调用情况(如状态码等)
600+
/// \return 本次请求的调用情况(如状态码等)
601601
CosResult BatchImageAuditing(const BatchImageAuditingReq& req,
602602
BatchImageAuditingResp* resp);
603603

@@ -606,43 +606,43 @@ class BucketOp : public BaseOp {
606606
/// \param req DescribeImageAuditingJob请求
607607
/// \param resp DescribeImageAuditingJob返回
608608
///
609-
/// \return 本次请求的调用情况(如状态码等)
609+
/// \return 本次请求的调用情况(如状态码等)
610610
CosResult DescribeImageAuditingJob(const DescribeImageAuditingJobReq& req,
611-
DescribeImageAuditingJobResp* resp);
611+
DescribeImageAuditingJobResp* resp);
612612

613613
/// \brief 提交视频审核任务
614614
/// \brief https://cloud.tencent.com/document/product/436/47316
615615
/// \param req DescribeVideoAuditingJob请求
616616
/// \param resp DescribeVideoAuditingJob返回
617617
///
618-
/// \return 本次请求的调用情况(如状态码等)
618+
/// \return 本次请求的调用情况(如状态码等)
619619
CosResult CreateVideoAuditingJob(const CreateVideoAuditingJobReq& req,
620-
CreateVideoAuditingJobResp* resp);
620+
CreateVideoAuditingJobResp* resp);
621621

622622
/// \brief 查询视频审核任务结果
623623
/// \brief https://cloud.tencent.com/document/product/436/47317
624624
/// \param req DescribeVideoAuditingJob请求
625625
/// \param resp DescribeVideoAuditingJob返回
626626
///
627-
/// \return 本次请求的调用情况(如状态码等)
627+
/// \return 本次请求的调用情况(如状态码等)
628628
CosResult DescribeVideoAuditingJob(const DescribeVideoAuditingJobReq& req,
629-
DescribeVideoAuditingJobResp* resp);
629+
DescribeVideoAuditingJobResp* resp);
630630

631631
/// \brief 提交音频审核任务
632632
/// \brief https://cloud.tencent.com/document/product/436/54063
633633
/// \param req DescribeAudioAuditingJob请求
634634
/// \param resp DescribeAudioAuditingJob返回
635635
///
636-
/// \return 本次请求的调用情况(如状态码等)
636+
/// \return 本次请求的调用情况(如状态码等)
637637
CosResult CreateAudioAuditingJob(const CreateAudioAuditingJobReq& req,
638-
CreateAudioAuditingJobResp* resp);
638+
CreateAudioAuditingJobResp* resp);
639639

640640
/// \brief 查询音频审核任务结果
641641
/// \brief https://cloud.tencent.com/document/product/436/54064
642642
/// \param req DescribeAudioAuditingJob请求
643643
/// \param resp DescribeAudioAuditingJob返回
644644
///
645-
/// \return 本次请求的调用情况(如状态码等)
645+
/// \return 本次请求的调用情况(如状态码等)
646646
CosResult DescribeAudioAuditingJob(const DescribeAudioAuditingJobReq& req,
647647
DescribeAudioAuditingJobResp* resp);
648648

@@ -651,54 +651,54 @@ class BucketOp : public BaseOp {
651651
/// \param req DescribeTextAuditingJob请求
652652
/// \param resp DescribeTextAuditingJob返回
653653
///
654-
/// \return 本次请求的调用情况(如状态码等)
654+
/// \return 本次请求的调用情况(如状态码等)
655655
CosResult CreateTextAuditingJob(const CreateTextAuditingJobReq& req,
656-
CreateTextAuditingJobResp* resp);
656+
CreateTextAuditingJobResp* resp);
657657

658658
/// \brief 查询文本审核任务结果
659659
/// \brief https://cloud.tencent.com/document/product/436/56288
660660
/// \param req DescribeTextAuditingJob请求
661661
/// \param resp DescribeTextAuditingJob返回
662662
///
663-
/// \return 本次请求的调用情况(如状态码等)
663+
/// \return 本次请求的调用情况(如状态码等)
664664
CosResult DescribeTextAuditingJob(const DescribeTextAuditingJobReq& req,
665-
DescribeTextAuditingJobResp* resp);
665+
DescribeTextAuditingJobResp* resp);
666666

667667
/// \brief 提交文档审核任务
668668
/// \brief https://cloud.tencent.com/document/product/436/59381
669669
/// \param req DescribeDocumentAuditingJob请求
670670
/// \param resp DescribeDocumentAuditingJob返回
671671
///
672-
/// \return 本次请求的调用情况(如状态码等)
672+
/// \return 本次请求的调用情况(如状态码等)
673673
CosResult CreateDocumentAuditingJob(const CreateDocumentAuditingJobReq& req,
674-
CreateDocumentAuditingJobResp* resp);
674+
CreateDocumentAuditingJobResp* resp);
675675

676676
/// \brief 查询文档审核任务结果
677677
/// \brief https://cloud.tencent.com/document/product/436/59382
678678
/// \param req DescribeDocumentAuditingJob请求
679679
/// \param resp DescribeDocumentAuditingJob返回
680680
///
681-
/// \return 本次请求的调用情况(如状态码等)
681+
/// \return 本次请求的调用情况(如状态码等)
682682
CosResult DescribeDocumentAuditingJob(const DescribeDocumentAuditingJobReq& req,
683-
DescribeDocumentAuditingJobResp* resp);
683+
DescribeDocumentAuditingJobResp* resp);
684684

685685
/// \brief 提交网页审核任务
686686
/// \brief https://cloud.tencent.com/document/product/436/63958
687687
/// \param req DescribeWebPageAuditingJob请求
688688
/// \param resp DescribeWebPageAuditingJob返回
689689
///
690-
/// \return 本次请求的调用情况(如状态码等)
690+
/// \return 本次请求的调用情况(如状态码等)
691691
CosResult CreateWebPageAuditingJob(const CreateWebPageAuditingJobReq& req,
692-
CreateWebPageAuditingJobResp* resp);
692+
CreateWebPageAuditingJobResp* resp);
693693

694694
/// \brief 查询网页审核任务结果
695695
/// \brief https://cloud.tencent.com/document/product/436/63959
696696
/// \param req DescribeWebPageAuditingJob请求
697697
/// \param resp DescribeWebPageAuditingJob返回
698698
///
699-
/// \return 本次请求的调用情况(如状态码等)
699+
/// \return 本次请求的调用情况(如状态码等)
700700
CosResult DescribeWebPageAuditingJob(const DescribeWebPageAuditingJobReq& req,
701-
DescribeWebPageAuditingJobResp* resp);
701+
DescribeWebPageAuditingJobResp* resp);
702702

703703

704704

‎include/op/file_download_task.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class FileDownTask : public Poco::Runnable {
2626
uint64_t conn_timeout_in_ms, uint64_t recv_timeout_in_ms,
2727
const SharedTransferHandler& handler = nullptr,
2828
uint64_t offset = 0, unsigned char* pbuf = NULL,
29-
const size_t data_len = 0,
29+
const size_t data_len = 0,
3030
bool verify_cert = true,
3131
const std::string& ca_lication = "",
3232
SSLCtxCallback ssl_ctx_cb = nullptr,

‎include/op/file_upload_task.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class FileUploadTask : public Poco::Runnable {
1414
public:
1515
FileUploadTask(const std::string& full_url, uint64_t conn_timeout_in_ms,
1616
uint64_t recv_timeout_in_ms, unsigned char* pbuf = NULL,
17-
const size_t data_len = 0,
17+
const size_t data_len = 0,
1818
bool verify_cert = true,
1919
const std::string& ca_location = "",
2020
SSLCtxCallback ssl_ctx_cb = nullptr,

0 commit comments

Comments
 (0)