1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- cpp/client/ct.cc.orig 2016-10-14 17:11:57 UTC
+++ cpp/client/ct.cc
@@ -451,8 +451,8 @@ static void MakeCert() {
// (This means the relevant section should be last in the configuration.)
// 1.2.3.1=DER:[raw encoding of proof]
static void WriteProofToConfig() {
- CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage();
- CHECK(!FLAGS_extensions_config_out.empty()) << google::ProgramUsage();
+ CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage();
+ CHECK(!FLAGS_extensions_config_out.empty()) << gflags::ProgramUsage();
string sct;
@@ -479,8 +479,8 @@ static const char kPEMLabel[] = "SERVERI
// Wrap the proof in the format expected by the TLS extension,
// so that we can feed it to OpenSSL.
static void ProofToExtensionData() {
- CHECK(!FLAGS_sct_token.empty()) << google::ProgramUsage();
- CHECK(!FLAGS_tls_extension_data_out.empty()) << google::ProgramUsage();
+ CHECK(!FLAGS_sct_token.empty()) << gflags::ProgramUsage();
+ CHECK(!FLAGS_tls_extension_data_out.empty()) << gflags::ProgramUsage();
string serialized_sct;
PCHECK(util::ReadBinaryFile(FLAGS_sct_token, &serialized_sct))
@@ -939,13 +939,13 @@ int GetSTH() {
// Exit code upon abnormal exit (CHECK failures): != 0
// (on UNIX, 134 is expected)
int main(int argc, char** argv) {
- google::SetUsageMessage(argv[0] + string(kUsage));
+ gflags::SetUsageMessage(argv[0] + string(kUsage));
util::InitCT(&argc, &argv);
ConfigureSerializerForV1CT();
const string main_command(argv[0]);
if (argc < 2) {
- std::cout << google::ProgramUsage();
+ std::cout << gflags::ProgramUsage();
return 1;
}
@@ -983,7 +983,7 @@ int main(int argc, char** argv) {
} else if (cmd == "sth") {
ret = GetSTH();
} else {
- std::cout << google::ProgramUsage();
+ std::cout << gflags::ProgramUsage();
ret = 1;
}
|
