From 90b308e8122c1c5c5981d09bfc47777c8b1216d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Sat, 14 Sep 2019 09:12:21 +0800 Subject: Remove rt prefix from headers other than rtclient.h --- Makefile.am | 4 ++-- rtclient/rtclient.h | 4 ++-- rtclient/rtticket.h | 9 --------- rtclient/rtuser.h | 33 --------------------------------- rtclient/ticket.h | 9 +++++++++ rtclient/user.h | 33 +++++++++++++++++++++++++++++++++ 6 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 rtclient/rtticket.h delete mode 100644 rtclient/rtuser.h create mode 100644 rtclient/ticket.h create mode 100644 rtclient/user.h diff --git a/Makefile.am b/Makefile.am index 3a90116..297113a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = librtclient.a librtclient_a_SOURCES = \ - rtclient/rtuser.h \ - rtclient/rtticket.h \ + rtclient/user.h \ + rtclient/ticket.h \ rtclient/rtclient.h \ rtclient.c diff --git a/rtclient/rtclient.h b/rtclient/rtclient.h index a872f37..d9a3639 100644 --- a/rtclient/rtclient.h +++ b/rtclient/rtclient.h @@ -1,8 +1,8 @@ #ifndef RTCLIENT_H #define RTCLIENT_H -#include "rtuser.h" -#include "rtticket.h" +#include "user.h" +#include "ticket.h" #ifdef __cplusplus extern "C" { diff --git a/rtclient/rtticket.h b/rtclient/rtticket.h deleted file mode 100644 index 3d78ac1..0000000 --- a/rtclient/rtticket.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef RTTICKET_H -#define RTTICKET_H - -struct rt_ticketlist { - unsigned int length; - char *tickets[]; -}; - -#endif // RTTICKET_H diff --git a/rtclient/rtuser.h b/rtclient/rtuser.h deleted file mode 100644 index 9fccea8..0000000 --- a/rtclient/rtuser.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef RTUSER_H -#define RTUSER_H - -#include - -struct rt_user { - char *id; - char *password; - char *name; - char *emailaddress; - char *realname; - char *nickname; - char *gecos; - char *organization; - char *address1; - char *address2; - char *city; - char *state; - char *zip; - char *country; - char *homephone; - char *workphone; - char *mobilephone; - char *pagerphone; - char *contactinfo; - char *comments; - char *signature; - char lang[2]; - bool privileged; - bool disabled; -}; - -#endif // RTUSER_H diff --git a/rtclient/ticket.h b/rtclient/ticket.h new file mode 100644 index 0000000..5c9c4da --- /dev/null +++ b/rtclient/ticket.h @@ -0,0 +1,9 @@ +#ifndef RTCLIENT_TICKET_H +#define RTCLIENT_TICKET_H + +struct rt_ticketlist { + unsigned int length; + char *tickets[]; +}; + +#endif // RTCLIENT_TICKET_H diff --git a/rtclient/user.h b/rtclient/user.h new file mode 100644 index 0000000..f48162e --- /dev/null +++ b/rtclient/user.h @@ -0,0 +1,33 @@ +#ifndef RTCLIENT_USER_H +#define RTCLIENT_USER_H + +#include + +struct rt_user { + char *id; + char *password; + char *name; + char *emailaddress; + char *realname; + char *nickname; + char *gecos; + char *organization; + char *address1; + char *address2; + char *city; + char *state; + char *zip; + char *country; + char *homephone; + char *workphone; + char *mobilephone; + char *pagerphone; + char *contactinfo; + char *comments; + char *signature; + char lang[2]; + bool privileged; + bool disabled; +}; + +#endif // RTCLIENT_USER_H -- cgit v1.2.3