summaryrefslogtreecommitdiffstats
path: root/src/windows/identity/kherr
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2009-10-31 00:48:38 +0000
committerTom Yu <tlyu@mit.edu>2009-10-31 00:48:38 +0000
commit02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch)
tree61b9147863cd8be3eff63903dc36cae168254bd5 /src/windows/identity/kherr
parent162ab371748cba0cc6f172419bd6e71fa04bb878 (diff)
downloadkrb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.gz
krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.xz
krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.zip
make mark-cstyle
make reindent git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/identity/kherr')
-rw-r--r--src/windows/identity/kherr/kherr.c33
-rw-r--r--src/windows/identity/kherr/kherr.h36
2 files changed, 34 insertions, 35 deletions
diff --git a/src/windows/identity/kherr/kherr.c b/src/windows/identity/kherr/kherr.c
index 006feb3af1..cd5cbc50f1 100644
--- a/src/windows/identity/kherr/kherr.c
+++ b/src/windows/identity/kherr/kherr.c
@@ -44,7 +44,7 @@ kherr_serial ctx_serial = 0;
#ifdef DEBUG
#define DEBUG_CONTEXT
-KHMEXP void
+KHMEXP void
kherr_debug_printf(wchar_t * fmt, ...)
{
va_list vl;
@@ -57,7 +57,7 @@ kherr_debug_printf(wchar_t * fmt, ...)
}
#endif
-KHMEXP void KHMAPI
+KHMEXP void KHMAPI
kherr_add_ctx_handler(kherr_ctx_handler h,
khm_int32 filter,
kherr_serial serial)
@@ -114,7 +114,7 @@ kherr_add_ctx_handler(kherr_ctx_handler h,
LeaveCriticalSection(&cs_error);
}
-KHMEXP void KHMAPI
+KHMEXP void KHMAPI
kherr_remove_ctx_handler(kherr_ctx_handler h,
kherr_serial serial)
{
@@ -134,7 +134,7 @@ kherr_remove_ctx_handler(kherr_ctx_handler h,
ctx_handlers[i] = ctx_handlers[i + 1];
}
}
-
+
LeaveCriticalSection(&cs_error);
}
@@ -182,7 +182,7 @@ attach_this_thread(void)
if (t)
return;
- t = PMALLOC(sizeof(kherr_thread) +
+ t = PMALLOC(sizeof(kherr_thread) +
sizeof(kherr_context *) * THREAD_STACK_SIZE);
t->nc_ctx = THREAD_STACK_SIZE;
t->n_ctx = 0;
@@ -247,7 +247,7 @@ push_context(kherr_context * c)
kherr_thread * nt;
nc_new = t->nc_ctx + THREAD_STACK_SIZE;
- cb_new = sizeof(kherr_thread) +
+ cb_new = sizeof(kherr_thread) +
sizeof(kherr_context *) * nc_new;
nt = PMALLOC(cb_new);
@@ -399,7 +399,7 @@ get_empty_context(void)
else {
c = PMALLOC(sizeof(kherr_context));
}
-
+
ZeroMemory(c,sizeof(*c));
c->severity = KHERR_NONE;
c->flags = KHERR_CF_UNBOUND;
@@ -409,7 +409,7 @@ get_empty_context(void)
LPUSH(&ctx_root_list, c);
LeaveCriticalSection(&cs_error);
-
+
return c;
}
@@ -497,7 +497,7 @@ pick_err_event(kherr_context * c)
EnterCriticalSection(&cs_error);
e = QTOP(c);
while(e) {
- if(!(e->flags & KHERR_RF_INERT) &&
+ if(!(e->flags & KHERR_RF_INERT) &&
s >= e->severity) {
ce = e;
s = e->severity;
@@ -589,7 +589,7 @@ resolve_string_resource(kherr_event * e,
if(e->flags & if_flag) {
if(e->h_module != NULL)
- chars = LoadString(e->h_module, (UINT)(INT_PTR) *str,
+ chars = LoadString(e->h_module, (UINT)(INT_PTR) *str,
tfmt, ARRAYLENGTH(tbuf));
if(e->h_module == NULL || chars == 0)
*str = NULL;
@@ -867,7 +867,7 @@ kherr_reportf_ex(enum kherr_severity severity,
return e;
}
-KHMEXP kherr_event * KHMAPI
+KHMEXP kherr_event * KHMAPI
kherr_report(enum kherr_severity severity,
const wchar_t * short_desc,
const wchar_t * facility,
@@ -938,7 +938,7 @@ kherr_report(enum kherr_severity severity,
}
KHMEXP void KHMAPI
-kherr_suggest(wchar_t * suggestion,
+kherr_suggest(wchar_t * suggestion,
enum kherr_suggestion suggestion_id,
khm_int32 flags)
{
@@ -1005,7 +1005,7 @@ _exit:
}
KHMEXP void KHMAPI
-kherr_facility(wchar_t * facility,
+kherr_facility(wchar_t * facility,
khm_int32 facility_id)
{
kherr_context * c;
@@ -1118,7 +1118,7 @@ kherr_push_context(kherr_context * c)
}
KHMEXP void KHMAPI
-kherr_push_new_context(khm_int32 flags)
+kherr_push_new_context(khm_int32 flags)
{
kherr_context * p = NULL;
kherr_context * c;
@@ -1405,8 +1405,8 @@ get_progress(kherr_context * c, khm_ui_4 * pnum, khm_ui_4 * pdenom)
}
KHMEXP void KHMAPI
-kherr_get_progress_i(kherr_context * c,
- khm_ui_4 * num,
+kherr_get_progress_i(kherr_context * c,
+ khm_ui_4 * num,
khm_ui_4 * denom)
{
if (num == NULL || denom == NULL)
@@ -1577,4 +1577,3 @@ kherr_dup_string(const wchar_t * s)
return _tstr(dest);
}
-
diff --git a/src/windows/identity/kherr/kherr.h b/src/windows/identity/kherr/kherr.h
index 90a72a35a7..a4ab68d066 100644
--- a/src/windows/identity/kherr/kherr.h
+++ b/src/windows/identity/kherr/kherr.h
@@ -54,7 +54,7 @@
If left undefined, the convenience macros will leave the facility
value undefined.
- */
+ */
#define KHERR_FACILITY NULL
#endif
@@ -177,13 +177,13 @@ typedef struct tag_kherr_event {
const wchar_t * suggestion; /*!< A suggested way to fix it
(localized,formatted) */
- kherr_severity severity;
+ kherr_severity severity;
/*!< Severity level. One of the
severity levels listed in
enumeration ::kherr_severity */
khm_int32 facility_id; /*!< Left to the application to
interpret */
- kherr_suggestion suggestion_id;
+ kherr_suggestion suggestion_id;
/*!< One of the suggestion ID's from
the enumeration
::kherr_suggestion */
@@ -217,44 +217,44 @@ typedef struct tag_kherr_event {
is mutually exclusive.
*/
enum kherr_event_flags {
- KHERR_RF_CSTR_SHORT_DESC= 0x00000000,
+ KHERR_RF_CSTR_SHORT_DESC= 0x00000000,
/*!< Short description is a constant
string */
- KHERR_RF_RES_SHORT_DESC = 0x00000001,
+ KHERR_RF_RES_SHORT_DESC = 0x00000001,
/*!< Short description is a string
resource */
- KHERR_RF_MSG_SHORT_DESC = 0x00000002,
+ KHERR_RF_MSG_SHORT_DESC = 0x00000002,
/*!< Short description is a message
resource */
- KHERR_RF_FREE_SHORT_DESC= 0x00000004,
+ KHERR_RF_FREE_SHORT_DESC= 0x00000004,
/*!< Short description is an allocated
string */
KHERR_RFMASK_SHORT_DESC = 0x00000007,
- KHERR_RF_CSTR_LONG_DESC = 0x00000000,
+ KHERR_RF_CSTR_LONG_DESC = 0x00000000,
/*!< Long description is a constant
string */
- KHERR_RF_RES_LONG_DESC = 0x00000008,
+ KHERR_RF_RES_LONG_DESC = 0x00000008,
/*!< Long description is a string
resource */
- KHERR_RF_MSG_LONG_DESC = 0x00000010,
+ KHERR_RF_MSG_LONG_DESC = 0x00000010,
/*!< Long description is a message
resouce */
- KHERR_RF_FREE_LONG_DESC = 0x00000020,
+ KHERR_RF_FREE_LONG_DESC = 0x00000020,
/*!< Long description is an allocated
string */
KHERR_RFMASK_LONG_DESC = 0x00000038,
- KHERR_RF_CSTR_SUGGEST = 0x00000000,
+ KHERR_RF_CSTR_SUGGEST = 0x00000000,
/*!< Suggestion is a constant
string */
- KHERR_RF_RES_SUGGEST = 0x00000040,
+ KHERR_RF_RES_SUGGEST = 0x00000040,
/*!< Suggestion is a string
resource */
- KHERR_RF_MSG_SUGGEST = 0x00000080,
+ KHERR_RF_MSG_SUGGEST = 0x00000080,
/*!< Suggestion is a message
resource */
- KHERR_RF_FREE_SUGGEST = 0x00000100,
+ KHERR_RF_FREE_SUGGEST = 0x00000100,
/*!< Suggestion is an allocated
string */
KHERR_RFMASK_SUGGEST = 0x000001C0,
@@ -298,7 +298,7 @@ typedef struct tag_kherr_context {
number as well as the pointer to the
context object. */
- kherr_severity severity;
+ kherr_severity severity;
/*!< Severity level. One of the
severity levels listed below. This
is the severity level of the context
@@ -406,7 +406,7 @@ enum kherr_ctx_event {
\see kherr_add_ctx_handler()
*/
-typedef void (KHMAPI * kherr_ctx_handler)(enum kherr_ctx_event,
+typedef void (KHMAPI * kherr_ctx_handler)(enum kherr_ctx_event,
kherr_context *);
/*! \brief Add a context event handler
@@ -468,7 +468,7 @@ typedef void (KHMAPI * kherr_ctx_handler)(enum kherr_ctx_event,
should be tracked. If this is zero, all error contexts can
trigger the handler.
*/
-KHMEXP void KHMAPI kherr_add_ctx_handler(kherr_ctx_handler h,
+KHMEXP void KHMAPI kherr_add_ctx_handler(kherr_ctx_handler h,
khm_int32 filter,
kherr_serial serial);