diff options
| author | Samuel Lidén Borell <samuel@slbdata.se> | 2011-12-04 12:57:41 +0100 |
|---|---|---|
| committer | Samuel Lidén Borell <samuel@slbdata.se> | 2011-12-04 13:00:45 +0100 |
| commit | 2b86e62594c15932b443165cf2371900a3659b61 (patch) | |
| tree | 9ab7ab0241e7520ae291aee9e5b175bf638556d4 /client | |
| parent | e922d0e0f71466de31668c67227bfeebdbd6f867 (diff) | |
| download | fribid-2b86e62594c15932b443165cf2371900a3659b61.tar.gz fribid-2b86e62594c15932b443165cf2371900a3659b61.zip | |
Don't use reserved identifier names
See the C99 standard (ISO/IEC 9899):
* 6.2.3 Name spaces of identifiers
* 7.1.3 Reserved identifiers
Diffstat (limited to 'client')
| -rw-r--r-- | client/backend.h | 8 | ||||
| -rw-r--r-- | client/backend_private.h | 12 | ||||
| -rw-r--r-- | client/bankid.h | 4 | ||||
| -rw-r--r-- | client/certutil.h | 4 | ||||
| -rw-r--r-- | client/misc.h | 4 | ||||
| -rw-r--r-- | client/pkcs11.c | 8 | ||||
| -rw-r--r-- | client/pkcs12.c | 4 | ||||
| -rw-r--r-- | client/platform.h | 4 | ||||
| -rw-r--r-- | client/request.h | 4 | ||||
| -rw-r--r-- | client/secmem.h | 4 | ||||
| -rw-r--r-- | client/xmldsig.h | 4 |
11 files changed, 30 insertions, 30 deletions
diff --git a/client/backend.h b/client/backend.h index 0e63e1b..b0a55ad 100644 --- a/client/backend.h +++ b/client/backend.h @@ -22,13 +22,13 @@ */ -#ifndef __BACKEND_H__ -#define __BACKEND_H__ +#ifndef BACKEND_H +#define BACKEND_H #include <stdbool.h> #include "../common/bidtypes.h" -typedef struct _Token Token; +typedef struct Token Token; typedef enum { TokenChange_Added, @@ -40,7 +40,7 @@ typedef enum { * A backend notifier object monitors all supported backends for tokens that * are used to identify a certain person. */ -typedef struct _BackendNotifier BackendNotifier; +typedef struct BackendNotifier BackendNotifier; typedef void (*BackendNotifyFunction)(Token *token, TokenChange change); diff --git a/client/backend_private.h b/client/backend_private.h index 34febfe..405818d 100644 --- a/client/backend_private.h +++ b/client/backend_private.h @@ -22,8 +22,8 @@ */ -#ifndef __BACKEND_PRIVATE_H__ -#define __BACKEND_PRIVATE_H__ +#ifndef BACKEND_PRIVATE_H +#define BACKEND_PRIVATE_H #include <stddef.h> #include <stdbool.h> @@ -37,8 +37,8 @@ #endif -typedef struct _Backend Backend; -struct _Backend { +typedef struct Backend Backend; +struct Backend { BackendPrivateType *private; const BackendNotifier *notifier; @@ -83,7 +83,7 @@ struct _Backend { char **signature, size_t *siglen); }; -struct _Token { +struct Token { const Backend *backend; TokenError lastError; TokenStatus status; @@ -94,7 +94,7 @@ struct _Token { const char *password; }; -struct _BackendNotifier { +struct BackendNotifier { size_t backendCount; Backend **backends; diff --git a/client/bankid.h b/client/bankid.h index b91ed92..1faa984 100644 --- a/client/bankid.h +++ b/client/bankid.h @@ -22,8 +22,8 @@ */ -#ifndef __BANKID_H__ -#define __BANKID_H__ +#ifndef BANKID_H +#define BANKID_H #include <stdbool.h> #include <stdint.h> diff --git a/client/certutil.h b/client/certutil.h index a822de6..e2c67e1 100644 --- a/client/certutil.h +++ b/client/certutil.h @@ -22,8 +22,8 @@ */ -#ifndef __CERTUTIL_H__ -#define __CERTUTIL_H__ +#ifndef CERTUTIL_H +#define CERTUTIL_H // Certificate utilities diff --git a/client/misc.h b/client/misc.h index 60198ef..ca0ad3c 100644 --- a/client/misc.h +++ b/client/misc.h @@ -22,8 +22,8 @@ */ -#ifndef __MISC_H__ -#define __MISC_H__ +#ifndef MISC_H +#define MISC_H #include <stdbool.h> diff --git a/client/pkcs11.c b/client/pkcs11.c index 4d81319..951f541 100644 --- a/client/pkcs11.c +++ b/client/pkcs11.c @@ -38,8 +38,8 @@ #include <openssl/safestack.h> #include <stdio.h> -typedef struct _PKCS11Token PKCS11Token; -typedef struct _PKCS11Private PKCS11Private; +typedef struct PKCS11Token PKCS11Token; +typedef struct PKCS11Private PKCS11Private; #define TokenType PKCS11Token #define BackendPrivateType PKCS11Private @@ -48,14 +48,14 @@ typedef struct _PKCS11Private PKCS11Private; #include "misc.h" #include "backend_private.h" -struct _PKCS11Token { +struct PKCS11Token { Token base; PKCS11_SLOT *slot; PKCS11_CERT *certs; unsigned int ncerts; }; -struct _PKCS11Private { +struct PKCS11Private { PKCS11_CTX *ctx; unsigned int nslots; PKCS11_SLOT *slots; diff --git a/client/pkcs12.c b/client/pkcs12.c index ab1f6cb..ebff588 100644 --- a/client/pkcs12.c +++ b/client/pkcs12.c @@ -39,7 +39,7 @@ #include <openssl/rand.h> #include <openssl/safestack.h> -typedef struct _PKCS12Token PKCS12Token; +typedef struct PKCS12Token PKCS12Token; #define TokenType PKCS12Token #include "../common/defines.h" @@ -54,7 +54,7 @@ typedef struct { PKCS12 *data; } SharedPKCS12; -struct _PKCS12Token { +struct PKCS12Token { Token base; SharedPKCS12 *sharedP12; diff --git a/client/platform.h b/client/platform.h index b18486a..1f1dd53 100644 --- a/client/platform.h +++ b/client/platform.h @@ -22,8 +22,8 @@ */ -#ifndef __PLATFORM_H__ -#define __PLATFORM_H__ +#ifndef PLATFORM_H +#define PLATFORM_H #include <stdbool.h> #include <stdint.h> diff --git a/client/request.h b/client/request.h index f04f4e6..392115a 100644 --- a/client/request.h +++ b/client/request.h @@ -22,8 +22,8 @@ */ -#ifndef __REQUEST_H__ -#define __REQUEST_H__ +#ifndef REQUEST_H +#define REQUEST_H #include <stdbool.h> #include <openssl/ssl.h> diff --git a/client/secmem.h b/client/secmem.h index 4404984..3f2d590 100644 --- a/client/secmem.h +++ b/client/secmem.h @@ -22,8 +22,8 @@ */ -#ifndef __SECMEM_H__ -#define __SECMEM_H__ +#ifndef SECMEM_H +#define SECMEM_H bool secmem_init_pool(void); char *secmem_get_page(long *page_size); diff --git a/client/xmldsig.h b/client/xmldsig.h index f4409db..15f9c97 100644 --- a/client/xmldsig.h +++ b/client/xmldsig.h @@ -22,8 +22,8 @@ */ -#ifndef __XMLDSIG_H__ -#define __XMLDSIG_H__ +#ifndef XMLDSIG_H +#define XMLDSIG_H #include "backend.h" |