Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace c-style headers with c++ equivalents #1512

Merged
merged 9 commits into from
Sep 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion cmake/FindReadline.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ else( READLINE_INCLUDE_DIR AND READLINE_LIBRARY )
set( CMAKE_REQUIRED_INCLUDES ${READLINE_INCLUDE_DIR} )
check_cxx_source_compiles(
"
#include <stdio.h>
#include <cstdio>
#include <readline/readline.h>
int main()
{
Expand Down
8 changes: 4 additions & 4 deletions src/XProtocol/XProtocol.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
/* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
/******************************************************************************/

#include <inttypes.h>
#include <cinttypes>
#include <netinet/in.h>
#include <sys/types.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <cstring>
#include <cstdlib>
#include <cstdio>
#include <sys/stat.h>
#include <unistd.h>

Expand Down
2 changes: 1 addition & 1 deletion src/XProtocol/XProtocol.hh
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,7 @@ struct ALIGN_CHECK {char chkszreq[25-sizeof(ClientRequest)];
/* X P r o t o c o l U t i l i t i e s */
/******************************************************************************/

#include <errno.h>
#include <cerrno>
#if defined(WIN32)
#if !defined(ENOTBLK)
# define ENOTBLK 15
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdBuffXL.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/******************************************************************************/

#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <sys/types.h>

#include "XrdOuc/XrdOucUtils.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/Xrd/XrdBuffer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <time.h>
#include <ctime>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <sys/types.h>

#include "XrdOuc/XrdOucUtils.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdBuffer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <cstdlib>
#include <unistd.h>
#include <sys/types.h>
#include "XrdSys/XrdSysPthread.hh"
Expand Down
8 changes: 4 additions & 4 deletions src/Xrd/XrdConfig.cc
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
*/

#include <unistd.h>
#include <ctype.h>
#include <cctype>
#include <fcntl.h>
#include <pwd.h>
#include <stdint.h>
#include <cstdint>
#include <string>
#include <string.h>
#include <stdio.h>
#include <cstring>
#include <cstdio>
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/types.h>
Expand Down
6 changes: 3 additions & 3 deletions src/Xrd/XrdInet.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <ctype.h>
#include <errno.h>
#include <cctype>
#include <cerrno>
#include <netdb.h>
#include <stdio.h>
#include <cstdio>
#include <unistd.h>
#include <sys/types.h>

Expand Down
6 changes: 3 additions & 3 deletions src/Xrd/XrdJob.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <string.h>
#include <cstdlib>
#include <cstring>
#include <strings.h>
#include <time.h>
#include <ctime>

// The XrdJob class is a super-class that is inherited by any class that needs
// to schedule work on behalf of itself. The XrdJob class is optimized for
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdLink.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@

#include <poll.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>
#include <sys/types.h>
#include <sys/uio.h>

Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdLinkCtl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

#include <sys/types.h>
#include <fcntl.h>
#include <time.h>
#include <ctime>

#include "Xrd/XrdInet.hh"
#include "Xrd/XrdLinkCtl.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdLinkInfo.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <cstdlib>
#include <sys/types.h>
#include <time.h>
#include <ctime>

#include "XrdSys/XrdSysPthread.hh"

Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdLinkMatch.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <string.h>
#include <cstring>

#include "Xrd/XrdLinkMatch.hh"
#include "XrdSys/XrdSysPlatform.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdLinkMatch.hh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/******************************************************************************/

#include <strings.h>
#include <stdlib.h>
#include <cstdlib>

class XrdLinkMatch
{
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdLinkXeq.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include <limits.h>
#include <poll.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>
#include <unistd.h>
#include <sys/types.h>
#include <sys/uio.h>
Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdLinkXeq.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include <sys/types.h>
#include <fcntl.h>
#include <time.h>
#include <ctime>

#include "Xrd/XrdLink.hh"
#include "Xrd/XrdLinkInfo.hh"
Expand Down
12 changes: 6 additions & 6 deletions src/Xrd/XrdMain.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@
/******************************************************************************/

#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#include <stdint.h>
#include <cctype>
#include <cerrno>
#include <cstdint>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
#include <cstdlib>
#include <cstring>
#include <strings.h>
#include <stdio.h>
#include <cstdio>
#include <sys/param.h>

#include "Xrd/XrdConfig.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdObject.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <string.h>
#include <cstring>
#include <strings.h>
#include <time.h>
#include <ctime>
#include <sys/types.h>

#include "Xrd/XrdJob.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdPoll.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/******************************************************************************/

#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>

#include "XrdSys/XrdSysError.hh"
#include "XrdSys/XrdSysFD.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdPollE.icc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/******************************************************************************/

#include <fcntl.h>
#include <stdlib.h>
#include <cstdlib>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/epoll.h>
Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdPollPoll.icc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
/******************************************************************************/

#include <signal.h>
#include <stdlib.h>
#include <cstdlib>

#include "Xrd/XrdLinkCtl.hh"
#include "Xrd/XrdPollPoll.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdScheduler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <errno.h>
#include <cerrno>
#include <fcntl.h>
#include <signal.h>
#include <stdio.h>
#include <cstdio>
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/types.h>
Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdSendQ.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>
#include <unistd.h>
#include <sys/uio.h>

Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdSendQ.hh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <string.h>
#include <cstring>
#include <unistd.h>
#include <sys/uio.h>

Expand Down
4 changes: 2 additions & 2 deletions src/Xrd/XrdStats.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include <sys/time.h>
#include <sys/resource.h>

Expand Down
2 changes: 1 addition & 1 deletion src/Xrd/XrdStats.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <cstdlib>

#include "XrdSys/XrdSysPthread.hh"

Expand Down
6 changes: 3 additions & 3 deletions src/XrdAcc/XrdAccAccess.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <ctype.h>
#include <stdio.h>
#include <time.h>
#include <cctype>
#include <cstdio>
#include <ctime>
#include <sys/param.h>

#include "XrdVersion.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/XrdAcc/XrdAccAudit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdio.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>

#include "XrdAcc/XrdAccAudit.hh"
#include "XrdSys/XrdSysError.hh"
Expand Down
4 changes: 2 additions & 2 deletions src/XrdAcc/XrdAccAuthFile.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <errno.h>
#include <cerrno>
#include <fcntl.h>
#include <string.h>
#include <cstring>
#include <strings.h>
#include <sys/stat.h>

Expand Down
4 changes: 2 additions & 2 deletions src/XrdAcc/XrdAccCapability.hh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <string.h>
#include <cstdlib>
#include <cstring>
#include <strings.h>

#include "XrdAcc/XrdAccPrivs.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/XrdAcc/XrdAccConfig.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
/******************************************************************************/

#include <unistd.h>
#include <ctype.h>
#include <cctype>
#include <fcntl.h>
#include <map>
#include <strings.h>
#include <stdio.h>
#include <time.h>
#include <cstdio>
#include <ctime>
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/types.h>
Expand Down
4 changes: 2 additions & 2 deletions src/XrdAcc/XrdAccEntity.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>

#include "XrdAcc/XrdAccEntity.hh"
#include "XrdOuc/XrdOucTokenizer.hh"
Expand Down
2 changes: 1 addition & 1 deletion src/XrdAcc/XrdAccEntity.hh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
/* specific prior written permission of the institution or contributor. */
/******************************************************************************/

#include <stdlib.h>
#include <cstdlib>
#include <vector>

#include "XrdSec/XrdSecAttr.hh"
Expand Down
6 changes: 3 additions & 3 deletions src/XrdAcc/XrdAccGroups.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
/******************************************************************************/

#include <unistd.h>
#include <ctype.h>
#include <errno.h>
#include <cctype>
#include <cerrno>
#include <limits.h>
#include <netdb.h>
#include <pwd.h>
#include <string.h>
#include <cstring>
#include <strings.h>
#include <sys/param.h>
#include <sys/types.h>
Expand Down