projects
/
shibboleth
/
cpp-sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VS10 solution files, convert from NULL macro to nullptr.
[shibboleth/cpp-sp.git]
/
util
/
mdquery.cpp
diff --git
a/util/mdquery.cpp
b/util/mdquery.cpp
index
9b928a8
..
b8ec308
100644
(file)
--- a/
util/mdquery.cpp
+++ b/
util/mdquery.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-20
09
Internet2
+ * Copyright 2001-20
10
Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,7
+17,7
@@
/**
* mdquery.cpp
*
/**
* mdquery.cpp
*
- * SAML Metadata Query tool layered on SP configuration
+ * SAML Metadata Query tool layered on SP configuration
.
*/
#if defined (_MSC_VER) || defined(__BORLANDC__)
*/
#if defined (_MSC_VER) || defined(__BORLANDC__)
@@
-57,13
+57,13
@@
void usage()
int main(int argc,char* argv[])
{
int main(int argc,char* argv[])
{
- char* entityID =
NULL
;
+ char* entityID =
nullptr
;
char* appID = "default";
bool strict = true;
char* appID = "default";
bool strict = true;
- char* prot =
NULL
;
- const XMLCh* protocol =
NULL
;
- char* rname =
NULL
;
- char* rns =
NULL
;
+ char* prot =
nullptr
;
+ const XMLCh* protocol =
nullptr
;
+ char* rname =
nullptr
;
+ char* rns =
nullptr
;
for (int i=1; i<argc; i++) {
if (!strcmp(argv[i],"-e") && i+1<argc)
for (int i=1; i<argc; i++) {
if (!strcmp(argv[i],"-e") && i+1<argc)
@@
-133,7
+133,7
@@
int main(int argc,char* argv[])
}
app->getMetadataProvider()->lock();
}
app->getMetadataProvider()->lock();
- MetadataProviderCriteria mc(*app, entityID,
NULL, NULL
, strict);
+ MetadataProviderCriteria mc(*app, entityID,
nullptr, nullptr
, strict);
if (rname) {
const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;
auto_ptr_XMLCh n(rname);
if (rname) {
const XMLCh* ns = rns ? XMLString::transcode(rns) : samlconstants::SAML20MD_NS;
auto_ptr_XMLCh n(rname);