From 6f2a704bbd55fb4368661cd0e8741f946bc71e36 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Tue, 6 Nov 2012 15:07:08 +0000 Subject: [PATCH] libcsa: Resolve 96 -Wunused-variable warnings. This is not all of them, another ~90 exist in generated code. --- cde/lib/csa/agent.c | 3 -- cde/lib/csa/ansi_c.c | 2 +- cde/lib/csa/api.c | 10 +--- cde/lib/csa/attr.c | 3 -- cde/lib/csa/calendar.c | 2 - cde/lib/csa/cmcbxdr.c | 18 ------- cde/lib/csa/cmxdr.c | 108 --------------------------------------- cde/lib/csa/connection.c | 3 -- cde/lib/csa/convert5-4.c | 3 +- cde/lib/csa/entry.c | 3 -- cde/lib/csa/laccess.c | 5 -- cde/lib/csa/match.c | 4 +- cde/lib/csa/reparser.y | 2 - cde/lib/csa/rpccalls.c | 6 --- cde/lib/csa/table.c | 5 -- 15 files changed, 5 insertions(+), 172 deletions(-) diff --git a/cde/lib/csa/agent.c b/cde/lib/csa/agent.c index 57b97061..bbae64cb 100644 --- a/cde/lib/csa/agent.c +++ b/cde/lib/csa/agent.c @@ -103,7 +103,6 @@ extern void _DtCm_init_agent() { int s = RPC_ANYSOCK; - XtInputId id; #if defined(SunOS) && SunOS < 55 || defined(USL) || defined(__uxp__) extern boolean_t rpc_reg(const u_long, const u_long, const u_long, @@ -464,8 +463,6 @@ static void _DtCm_handle_callback() { _CallbackInfo *ptr, *prev; - Calendar *cal; - _DtCmCallbackEntry *cb; boolean_t keep = B_FALSE; DP(("agent.c: _DtCm_handle_callback()\n")); diff --git a/cde/lib/csa/ansi_c.c b/cde/lib/csa/ansi_c.c index 016d3e37..29739810 100644 --- a/cde/lib/csa/ansi_c.c +++ b/cde/lib/csa/ansi_c.c @@ -79,5 +79,5 @@ strncasecmp(register const char *s1, return (int) (*s1 - *s2); } #else -static int unused = 0; /* Make the compiler happy. */ +int ansi_c_strcasecmp_not_needed = 0; /* Make the compiler happy. */ #endif diff --git a/cde/lib/csa/api.c b/cde/lib/csa/api.c index 9c789a51..1465af94 100644 --- a/cde/lib/csa/api.c +++ b/cde/lib/csa/api.c @@ -350,7 +350,6 @@ csa_list_entries( CSA_return_code stat; Calendar *cal; _DtCm_libentry *elist; - int i; DP(("api.c: csa_list_entries\n")); @@ -453,7 +452,6 @@ csa_read_entry_attributes( { CSA_return_code stat; _DtCm_libentry *entry; - int i; DP(("api.c: csa_read_entry_attributes\n")); @@ -573,9 +571,7 @@ csa_read_calendar_attributes( CSA_attribute **calendar_attributes, CSA_extension *read_calendar_attributes_extensions) { - CSA_return_code stat; Calendar *cal; - int i; DP(("api.c: csa_read_calendar_attributes\n")); @@ -816,7 +812,6 @@ csa_update_calendar_attributes( { CSA_return_code stat = CSA_SUCCESS; Calendar *cal; - int i; DP(("api.c: csa_update_calendar_attributes\n")); @@ -917,7 +912,6 @@ csa_delete_entry( { CSA_return_code stat; _DtCm_libentry *entry; - int i; DP(("api.c: csa_delete_entry\n")); @@ -969,7 +963,6 @@ csa_list_entry_sequence( cms_attribute *rtimes; /* needed temporaryly */ time_t start = 0, end = 0; - char *ptr; DP(("api.c: csa_list_entry_sequence\n")); @@ -1059,7 +1052,6 @@ csa_read_next_reminder( CSA_return_code stat; Calendar *cal; _DtCm_libentry *eptr, *prev = NULL, *head = NULL; - CSA_reminder_reference * rlist; int i; time_t timeval; @@ -1133,7 +1125,7 @@ csa_update_entry_attributes( CSA_extension *update_entry_attributes_extensions) { CSA_return_code stat; - _DtCm_libentry *oentry, *tptr, *nentry; + _DtCm_libentry *oentry, *nentry; DP(("api.c: csa_update_entry_attributes\n")); diff --git a/cde/lib/csa/attr.c b/cde/lib/csa/attr.c index eaa16841..0c59ceda 100644 --- a/cde/lib/csa/attr.c +++ b/cde/lib/csa/attr.c @@ -1668,7 +1668,6 @@ hash_entry_attrs( cms_attribute **hattrs, uint *num) { - CSA_return_code stat; int i, j, index, count = 0; cms_attribute *nattrs; char *name; @@ -1718,7 +1717,6 @@ hash_cal_attrs( cms_attribute **hattrs, uint *num) { - CSA_return_code stat; int i, j, index, count = 0; cms_attribute *nattrs; char *name; @@ -1949,7 +1947,6 @@ _CheckCalendarName(char *owner, char *cname, cms_attribute_value *val) CSA_return_code stat; char *ptr, *optr; char user[BUFSIZ]; - int res; boolean_t isuser; if (val->type != CSA_VALUE_STRING) diff --git a/cde/lib/csa/calendar.c b/cde/lib/csa/calendar.c index ea1b75b5..c0eb268f 100644 --- a/cde/lib/csa/calendar.c +++ b/cde/lib/csa/calendar.c @@ -613,8 +613,6 @@ _get_product_identifier(Calendar *cal, CSA_attribute *attr) static CSA_return_code _get_version_supported(Calendar *cal, CSA_attribute *attr) { - char buf[10]; - if (attr->name = strdup(CSA_CAL_ATTR_VERSION)) return (_DtCm_set_csa_string_attrval( _DtCM_SPEC_VERSION_SUPPORTED, &attr->value, diff --git a/cde/lib/csa/cmcbxdr.c b/cde/lib/csa/cmcbxdr.c index 11357dba..c6d2f188 100644 --- a/cde/lib/csa/cmcbxdr.c +++ b/cde/lib/csa/cmcbxdr.c @@ -44,9 +44,6 @@ bool_t xdr_cmcb_cal_attr_data(register XDR *xdrs, cmcb_cal_attr_data *objp) { - - register long *buf; - if (!xdr_array(xdrs, (char **)&objp->names, (u_int *) &objp->num_names, ~0, sizeof (cms_name), (xdrproc_t) xdr_cms_name)) return (FALSE); @@ -60,9 +57,6 @@ xdr_cmcb_cal_attr_data(register XDR *xdrs, cmcb_cal_attr_data *objp) bool_t xdr_cmcb_add_entry_data(register XDR *xdrs, cmcb_add_entry_data *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->id, ~0)) return (FALSE); return (TRUE); @@ -75,9 +69,6 @@ xdr_cmcb_add_entry_data(register XDR *xdrs, cmcb_add_entry_data *objp) bool_t xdr_cmcb_delete_entry_data(register XDR *xdrs, cmcb_delete_entry_data *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->id, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->scope)) @@ -96,9 +87,6 @@ xdr_cmcb_delete_entry_data(register XDR *xdrs, cmcb_delete_entry_data *objp) bool_t xdr_cmcb_update_entry_data(register XDR *xdrs, cmcb_update_entry_data *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->newid, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->oldid, ~0)) @@ -113,9 +101,6 @@ xdr_cmcb_update_entry_data(register XDR *xdrs, cmcb_update_entry_data *objp) bool_t xdr_cmcb_update_data(register XDR *xdrs, cmcb_update_data *objp) { - - register long *buf; - if (!xdr_int(xdrs, &objp->reason)) return (FALSE); @@ -151,9 +136,6 @@ xdr_cmcb_update_data(register XDR *xdrs, cmcb_update_data *objp) bool_t xdr_cmcb_update_callback_args(register XDR *xdrs, cmcb_update_callback_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->calendar, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->user, ~0)) diff --git a/cde/lib/csa/cmxdr.c b/cde/lib/csa/cmxdr.c index eb0bf478..e3553e81 100644 --- a/cde/lib/csa/cmxdr.c +++ b/cde/lib/csa/cmxdr.c @@ -63,9 +63,6 @@ xdr_time_t(register XDR *xdrs, time_t *objp) bool_t xdr_cms_name(register XDR *xdrs, cms_name *objp) { - - register long *buf; - if (!xdr_string(xdrs, objp, ~0)) return (FALSE); return (TRUE); @@ -78,9 +75,6 @@ xdr_cms_name(register XDR *xdrs, cms_name *objp) bool_t xdr_cms_access_entry(register XDR *xdrs, cms_access_entry *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->user, ~0)) return (FALSE); if (!xdr_u_int(xdrs, &objp->rights)) @@ -99,9 +93,6 @@ xdr_cms_access_entry(register XDR *xdrs, cms_access_entry *objp) bool_t xdr_cms_key(register XDR *xdrs, cms_key *objp) { - - register long *buf; - if (!xdr_time_t(xdrs, &objp->time)) return (FALSE); if (!xdr_long(xdrs, &objp->id)) @@ -112,9 +103,6 @@ xdr_cms_key(register XDR *xdrs, cms_key *objp) bool_t xdr_CSA_opaque_data(register XDR *xdrs, CSA_opaque_data *objp) { - - register long *buf; - if (!xdr_bytes(xdrs, (char **)&objp->data, (u_int *) &objp->size, ~0)) return (FALSE); return (TRUE); @@ -123,9 +111,6 @@ xdr_CSA_opaque_data(register XDR *xdrs, CSA_opaque_data *objp) bool_t xdr_CSA_reminder(register XDR *xdrs, CSA_reminder *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->lead_time, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->snooze_time, ~0)) @@ -140,9 +125,6 @@ xdr_CSA_reminder(register XDR *xdrs, CSA_reminder *objp) bool_t xdr_CSA_date_time_entry(register XDR *xdrs, CSA_date_time_entry *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->date_time, ~0)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->next, @@ -154,9 +136,6 @@ xdr_CSA_date_time_entry(register XDR *xdrs, CSA_date_time_entry *objp) bool_t xdr_cms_attribute_value(register XDR *xdrs, cms_attribute_value *objp) { - - register long *buf; - if (!xdr_int(xdrs, &objp->type)) return (FALSE); @@ -217,9 +196,6 @@ xdr_cms_attribute_value(register XDR *xdrs, cms_attribute_value *objp) bool_t xdr_cms_attr_name(register XDR *xdrs, cms_attr_name *objp) { - - register long *buf; - if (!xdr_short(xdrs, &objp->num)) return (FALSE); if (!xdr_string(xdrs, &objp->name, ~0)) @@ -234,9 +210,6 @@ xdr_cms_attr_name(register XDR *xdrs, cms_attr_name *objp) bool_t xdr_cms_attribute(register XDR *xdrs, cms_attribute *objp) { - - register long *buf; - if (!xdr_cms_attr_name(xdrs, &objp->name)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->value, @@ -254,9 +227,6 @@ xdr_cms_attribute(register XDR *xdrs, cms_attribute *objp) bool_t xdr_cms_entry(register XDR *xdrs, cms_entry *objp) { - - register long *buf; - if (!xdr_cms_key(xdrs, &objp->key)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->attrs, (u_int *) &objp->num_attrs, @@ -278,9 +248,6 @@ xdr_cms_entry(register XDR *xdrs, cms_entry *objp) bool_t xdr_cms_enumerate_calendar_attr_res(register XDR *xdrs, cms_enumerate_calendar_attr_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->names, (u_int *) &objp->num_names, @@ -299,9 +266,6 @@ xdr_cms_enumerate_calendar_attr_res(register XDR *xdrs, cms_enumerate_calendar_a bool_t xdr_cms_list_calendars_res(register XDR *xdrs, cms_list_calendars_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->names, (u_int *) &objp->num_names, @@ -318,9 +282,6 @@ xdr_cms_list_calendars_res(register XDR *xdrs, cms_list_calendars_res *objp) bool_t xdr_cms_open_args(register XDR *xdrs, cms_open_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) @@ -343,9 +304,6 @@ xdr_cms_open_args(register XDR *xdrs, cms_open_args *objp) bool_t xdr_cms_open_res(register XDR *xdrs, cms_open_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_int(xdrs, &objp->svr_vers)) @@ -368,9 +326,6 @@ xdr_cms_open_res(register XDR *xdrs, cms_open_res *objp) bool_t xdr_cms_create_args(register XDR *xdrs, cms_create_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->char_set, ~0)) @@ -391,9 +346,6 @@ xdr_cms_create_args(register XDR *xdrs, cms_create_args *objp) bool_t xdr_cms_remove_args(register XDR *xdrs, cms_remove_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) @@ -409,9 +361,6 @@ xdr_cms_remove_args(register XDR *xdrs, cms_remove_args *objp) bool_t xdr_cms_register_args(register XDR *xdrs, cms_register_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_u_int(xdrs, &objp->update_type)) @@ -437,9 +386,6 @@ xdr_cms_register_args(register XDR *xdrs, cms_register_args *objp) bool_t xdr_cms_get_cal_attr_res(register XDR *xdrs, cms_get_cal_attr_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->attrs, (u_int *) &objp->num_attrs, @@ -456,9 +402,6 @@ xdr_cms_get_cal_attr_res(register XDR *xdrs, cms_get_cal_attr_res *objp) bool_t xdr_cms_get_cal_attr_args(register XDR *xdrs, cms_get_cal_attr_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->names, (u_int *) &objp->num_names, @@ -475,9 +418,6 @@ xdr_cms_get_cal_attr_args(register XDR *xdrs, cms_get_cal_attr_args *objp) bool_t xdr_cms_set_cal_attr_args(register XDR *xdrs, cms_set_cal_attr_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) @@ -498,9 +438,6 @@ xdr_cms_set_cal_attr_args(register XDR *xdrs, cms_set_cal_attr_args *objp) bool_t xdr_cms_archive_res(register XDR *xdrs, cms_archive_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_string(xdrs, &objp->data, ~0)) @@ -516,9 +453,6 @@ xdr_cms_archive_res(register XDR *xdrs, cms_archive_res *objp) bool_t xdr_cms_archive_args(register XDR *xdrs, cms_archive_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_bool(xdrs, &objp->delete)) @@ -542,9 +476,6 @@ xdr_cms_archive_args(register XDR *xdrs, cms_archive_args *objp) bool_t xdr_cms_restore_args(register XDR *xdrs, cms_restore_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->data, ~0)) @@ -568,9 +499,6 @@ xdr_cms_restore_args(register XDR *xdrs, cms_restore_args *objp) bool_t xdr_cms_reminder_ref(register XDR *xdrs, cms_reminder_ref *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->reminder_name, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->entryid, ~0)) @@ -595,9 +523,6 @@ xdr_cms_reminder_ref(register XDR *xdrs, cms_reminder_ref *objp) bool_t xdr_cms_reminder_res(register XDR *xdrs, cms_reminder_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->rems, sizeof (cms_reminder_ref), @@ -614,9 +539,6 @@ xdr_cms_reminder_res(register XDR *xdrs, cms_reminder_res *objp) bool_t xdr_cms_reminder_args(register XDR *xdrs, cms_reminder_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_time_t(xdrs, &objp->tick)) @@ -637,9 +559,6 @@ xdr_cms_reminder_args(register XDR *xdrs, cms_reminder_args *objp) bool_t xdr_cms_entries_res(register XDR *xdrs, cms_entries_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->entries, sizeof (cms_entry), @@ -656,9 +575,6 @@ xdr_cms_entries_res(register XDR *xdrs, cms_entries_res *objp) bool_t xdr_cms_lookup_entries_args(register XDR *xdrs, cms_lookup_entries_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_string(xdrs, &objp->char_set, ~0)) @@ -680,9 +596,6 @@ xdr_cms_lookup_entries_args(register XDR *xdrs, cms_lookup_entries_args *objp) bool_t xdr_cms_enumerate_args(register XDR *xdrs, cms_enumerate_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_long(xdrs, &objp->id)) @@ -704,9 +617,6 @@ xdr_cms_get_entry_attr_res_item( register XDR *xdrs, cms_get_entry_attr_res_item *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_cms_key(xdrs, &objp->key)) @@ -732,9 +642,6 @@ xdr_cms_get_entry_attr_res_item( bool_t xdr_cms_get_entry_attr_res(register XDR *xdrs, cms_get_entry_attr_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->entries, @@ -752,9 +659,6 @@ xdr_cms_get_entry_attr_res(register XDR *xdrs, cms_get_entry_attr_res *objp) bool_t xdr_cms_get_entry_attr_args(register XDR *xdrs, cms_get_entry_attr_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_array(xdrs, (char **)&objp->keys, (u_int *) &objp->num_keys, @@ -776,9 +680,6 @@ xdr_cms_get_entry_attr_args(register XDR *xdrs, cms_get_entry_attr_args *objp) bool_t xdr_cms_entry_res(register XDR *xdrs, cms_entry_res *objp) { - - register long *buf; - if (!xdr_u_long(xdrs, &objp->stat)) return (FALSE); if (!xdr_pointer(xdrs, (char **)&objp->entry, sizeof (cms_entry), @@ -795,9 +696,6 @@ xdr_cms_entry_res(register XDR *xdrs, cms_entry_res *objp) bool_t xdr_cms_insert_args(register XDR *xdrs, cms_insert_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) @@ -816,9 +714,6 @@ xdr_cms_insert_args(register XDR *xdrs, cms_insert_args *objp) bool_t xdr_cms_update_args(register XDR *xdrs, cms_update_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) @@ -841,9 +736,6 @@ xdr_cms_update_args(register XDR *xdrs, cms_update_args *objp) bool_t xdr_cms_delete_args(register XDR *xdrs, cms_delete_args *objp) { - - register long *buf; - if (!xdr_string(xdrs, &objp->cal, ~0)) return (FALSE); if (!xdr_int(xdrs, &objp->pid)) diff --git a/cde/lib/csa/connection.c b/cde/lib/csa/connection.c index 8f5bd081..a7faf6f0 100644 --- a/cde/lib/csa/connection.c +++ b/cde/lib/csa/connection.c @@ -66,7 +66,6 @@ static tcp_count = 0; static cl_count = 0; static _DtCm_Client_Info *client_cache_head = NULL; static _DtCm_Client_Info *client_cache_tail = NULL; -static char *svcfmt = "Error on server %s\n"; /***************************************************************************** * forward declaration of static functions. @@ -263,7 +262,6 @@ _DtCm_clnt_call( _DtCm_Client_Info *ci; _DtCm_Transport_Type ttype; enum clnt_stat status = RPC_FAILED; - char errbuffer[100]; int retry = conn->retry; while (B_TRUE) { @@ -325,7 +323,6 @@ _DtCm_add_registration( { _DtCm_Target_List *listp, *prev; _DtCm_Target_List *listitem; - char *host; int result; if (ci == NULL || cal == NULL) diff --git a/cde/lib/csa/convert5-4.c b/cde/lib/csa/convert5-4.c index fb439d54..0421327c 100644 --- a/cde/lib/csa/convert5-4.c +++ b/cde/lib/csa/convert5-4.c @@ -239,7 +239,7 @@ _DtCm_attrs_to_apptdata(uint size, CSA_attribute *attrs, Appt_4 *appt) { CSA_return_code stat = CSA_SUCCESS; _DtCm_old_attrs oldattr; - char *string, *ptr; + char *string; int interval = 0, week_num = 0, i; boolean_t set_interval = B_FALSE, set_weeknum = B_FALSE; time_t endtick = -1; @@ -784,7 +784,6 @@ _DtCm_add_reminder(char *rem, CSA_reminder * val, Appt_4 *appt) { Attribute_4 *newattr, *attrs, *prev = NULL; char adv[80]; - char *str; time_t ltime = 0; /* diff --git a/cde/lib/csa/entry.c b/cde/lib/csa/entry.c index f4febf51..3a985a9a 100644 --- a/cde/lib/csa/entry.c +++ b/cde/lib/csa/entry.c @@ -257,7 +257,6 @@ _DtCm_libentry_to_entryh( CSA_uint32 *size, CSA_entry_handle **entries_r) { - CSA_return_code stat = CSA_SUCCESS; CSA_entry_handle *eh; _DtCm_libentry *ptr; int i, j; @@ -480,7 +479,6 @@ _DtCm_cms2csa_reminder_ref( cms_reminder_ref *rptr; int i, count; char isotime[BUFSIZ]; - char *ptr; CSA_opaque_data opq; if (num_rems == NULL || csarems == NULL) @@ -626,7 +624,6 @@ _DtCm_free_libentries(_DtCm_libentry *entry) extern void _DtCm_free_reminder_references(uint num_rems, CSA_reminder_reference *rems) { - CSA_reminder_reference *nptr; _DtCm_libentry *entry, *head, *cptr; int i; diff --git a/cde/lib/csa/laccess.c b/cde/lib/csa/laccess.c index 0da60b30..da64c108 100644 --- a/cde/lib/csa/laccess.c +++ b/cde/lib/csa/laccess.c @@ -54,10 +54,6 @@ static boolean_t match_backward(char *str1, char *str2); extern boolean_t _DtCmIsSamePath(char *str1, char *str2) { - char *ptr1,*ptr2; - char *user; - int res, n; - if (str1 == NULL || str2 == NULL) return(B_FALSE); @@ -81,7 +77,6 @@ _DtCmIsSameUser(char *user1, char *user2) { char *str1, *str2; char buf[BUFSIZ], *domain; - boolean_t res; if (user1 == NULL || user2 == NULL) return (B_FALSE); diff --git a/cde/lib/csa/match.c b/cde/lib/csa/match.c index 805a9085..eb8947f5 100644 --- a/cde/lib/csa/match.c +++ b/cde/lib/csa/match.c @@ -101,7 +101,7 @@ _DtCmHashCriteria( int i, j, index, starti = -1, endi = -1; time_t tstart1, tstart2, tend1, tend2; time_t tick; - char *ptr, *name; + char *name; cms_attribute_value *val, *hval; boolean_t keep; @@ -399,7 +399,7 @@ _DtCm_match_reminders(Reminder_4 *rems, uint num_names, char **names) { Reminder_4 *head = NULL; Reminder_4 *freelist = NULL; - Reminder_4 *nptr, *rlist; + Reminder_4 *nptr; if (rems == NULL) return (NULL); diff --git a/cde/lib/csa/reparser.y b/cde/lib/csa/reparser.y index 927af543..f541978f 100644 --- a/cde/lib/csa/reparser.y +++ b/cde/lib/csa/reparser.y @@ -920,8 +920,6 @@ DeriveDailyEvent( { RepeatEvent *re; DailyData *dd; - NumberList *nl; - int i = 0; dd = (DailyData *)calloc(1, sizeof(DailyData)); diff --git a/cde/lib/csa/rpccalls.c b/cde/lib/csa/rpccalls.c index a4a7cd52..6c4b764a 100644 --- a/cde/lib/csa/rpccalls.c +++ b/cde/lib/csa/rpccalls.c @@ -221,7 +221,6 @@ _DtCm_rpc_create_calendar( } else if (ci->vers_out < TABLEVERS_4) { _DtCm_libentry *entries; char *ptr, *owner; - boolean_t isuser; /* check to make sure user is not creating a calendar * using another user's name @@ -528,7 +527,6 @@ _DtCm_rpc_enumerate_sequence( { _DtCm_Client_Info *ci=NULL; CSA_return_code stat = CSA_SUCCESS; - int i; DP(("rpccalls.c: _DtCm_rpc_enumerate_sequence\n")); @@ -582,7 +580,6 @@ _DtCm_rpc_lookup_entry_by_id(Calendar *cal, _DtCm_libentry *entry) { _DtCm_Client_Info *ci=NULL; CSA_return_code stat = CSA_SUCCESS; - int i; DP(("rpccalls.c: _DtCm_rpc_lookup_entry_by_id\n")); @@ -732,7 +729,6 @@ _DtCm_rpc_set_cal_attrs(Calendar *cal, CSA_uint32 num_attrs, CSA_attribute * att { _DtCm_Client_Info *ci; CSA_return_code stat = CSA_SUCCESS; - int i; DP(("rpccalls.c: _DtCm_rpc_set_cal_attrs\n")); @@ -879,8 +875,6 @@ _DtCm_rpc_update_entry( { _DtCm_Client_Info *ci = NULL; CSA_return_code stat = CSA_SUCCESS; - _DtCm_libentry *hptr = NULL, *tptr, *cptr; - int i; DP(("rpccalls.c: _DtCm_rpc_update_entry\n")); diff --git a/cde/lib/csa/table.c b/cde/lib/csa/table.c index 7243aab5..e0e970c8 100644 --- a/cde/lib/csa/table.c +++ b/cde/lib/csa/table.c @@ -386,8 +386,6 @@ _DtCm_table_lookup_range( _DtCm_Connection *conn; Range_4 new_range, old_range; Appt_4 *appts = NULL, *lptr = NULL, *tptr = NULL, *rptr = NULL; - boolean_t need_matching = B_FALSE; - time_t tick; DP(("table.c: _DtCm_table_lookup_range\n")); @@ -670,7 +668,6 @@ _DtCm_table_insert( Table_Res_4 *res = NULL; _DtCm_Connection *conn; Appt_4 *appt4; - int id, i, j; DP(("table.c: _DtCm_table_insert\n")); @@ -789,7 +786,6 @@ _DtCm_table_update( Id_4 key; Options_4 opt; Appt_4 *appt4; - int id, i, j; _DtCm_libentry *temp; DP(("table.c: _DtCm_table_update_one\n")); @@ -942,7 +938,6 @@ _DtCm_table_delete( Table_Res_4 *res = NULL; _DtCm_Connection *conn; Uidopt_4 key; - int id, i, j; cms_attribute *rtype; DP(("table.c: _DtCm_table_delete\n")); -- 2.25.1