ctld: Rename {ctld,isns}.h to {ctld,isns}.hh
Subsequent commits will use C++ in these headers rather than only C. conf.h remains as a C-only header since it is intended for use by the C code generated from parse.y. Sponsored by: Chelsio Communications Pull Request: https://github.com/freebsd/freebsd-src/pull/1794
This commit is contained in:
@@ -40,7 +40,7 @@
|
||||
#include <cam/scsi/scsi_all.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "ctld.h"
|
||||
#include "ctld.hh"
|
||||
|
||||
static struct conf *conf = NULL;
|
||||
static struct auth_group *auth_group = NULL;
|
||||
|
||||
@@ -52,8 +52,8 @@
|
||||
#include <cam/scsi/scsi_all.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "ctld.h"
|
||||
#include "isns.h"
|
||||
#include "ctld.hh"
|
||||
#include "isns.hh"
|
||||
|
||||
static bool timed_out(void);
|
||||
#ifdef ICL_KERNEL_PROXY
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef CTLD_H
|
||||
#define CTLD_H
|
||||
#ifndef __CTLD_HH__
|
||||
#define __CTLD_HH__
|
||||
|
||||
#include <sys/_nv.h>
|
||||
#include <sys/queue.h>
|
||||
@@ -359,4 +359,4 @@ void discovery(struct ctld_connection *conn);
|
||||
|
||||
void set_timeout(int timeout, int fatal);
|
||||
|
||||
#endif /* !CTLD_H */
|
||||
#endif /* !__CTLD_HH__ */
|
||||
@@ -38,7 +38,7 @@
|
||||
#include <netdb.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include "ctld.h"
|
||||
#include "ctld.hh"
|
||||
#include "iscsi_proto.h"
|
||||
|
||||
static struct pdu *
|
||||
|
||||
@@ -40,8 +40,8 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "ctld.h"
|
||||
#include "isns.h"
|
||||
#include "ctld.hh"
|
||||
#include "isns.hh"
|
||||
|
||||
struct isns_req *
|
||||
isns_req_alloc(void)
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef _ISNS_H
|
||||
#define _ISNS_H
|
||||
#ifndef __ISNS_HH__
|
||||
#define __ISNS_HH__
|
||||
|
||||
#define ISNS_VERSION 0x0001
|
||||
|
||||
@@ -87,4 +87,4 @@ int isns_req_send(int s, struct isns_req *req);
|
||||
int isns_req_receive(int s, struct isns_req *req);
|
||||
uint32_t isns_req_get_status(struct isns_req *req);
|
||||
|
||||
#endif /* _ISNS_H */
|
||||
#endif /* __ISNS_HH__ */
|
||||
@@ -68,7 +68,7 @@
|
||||
#include <cam/ctl/ctl_util.h>
|
||||
#include <cam/ctl/ctl_scsi_all.h>
|
||||
|
||||
#include "ctld.h"
|
||||
#include "ctld.hh"
|
||||
|
||||
#ifdef ICL_KERNEL_PROXY
|
||||
#include <netdb.h>
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <cam/ctl/ctl_io.h>
|
||||
#include <cam/ctl/ctl_ioctl.h>
|
||||
|
||||
#include "ctld.h"
|
||||
#include "ctld.hh"
|
||||
#include "iscsi_proto.h"
|
||||
|
||||
#define MAX_DATA_SEGMENT_LENGTH (128 * 1024)
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <netinet/ip.h>
|
||||
|
||||
#include "conf.h"
|
||||
#include "ctld.h"
|
||||
#include "ctld.hh"
|
||||
|
||||
static bool uclparse_toplevel(const ucl_object_t *);
|
||||
static bool uclparse_chap(const char *, const ucl_object_t *);
|
||||
|
||||
Reference in New Issue
Block a user