debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtcm: Resolve 303 compiler warnings.

Browse Source
This commit is contained in:
Peter Howkins
2015-01-13 14:22:25 +00:00
parent fe39b630b3
commit 8baeb4c0a0
44 changed files with 275 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cde/programs/dtcm/dtcm/MonthPanel.c
View File

@@ -389,7 +389,7 @@ Initialize( Widget rw, Widget nw, ArgList args, Cardinal *num_args )
if (new_w->month_panel.active_days) {
btn = XmCreatePushButtonGadget((Widget)new_w, buf, wargs, 1);
XtAddCallback(btn, XmNactivateCallback, DayCallback,
(XtPointer)(i+1));
(XtPointer) (intptr_t) (i+1));
}
else {
btn = XmCreateLabelGadget((Widget) new_w, buf, wargs, 1);
@@ -906,7 +906,7 @@ static void DayCallback(Widget w, XtPointer client, XtPointer call)
XmMonthPanelCallbackStruct data;
data.type = DAY_SELECTION;
data.day = (int) client;
data.day = (intptr_t) client;
XtCallCallbackList((Widget) mp, mp->month_panel.callback, &data);
}

8
cde/programs/dtcm/dtcm/blist.c
View File

@@ -248,7 +248,7 @@ blist_name_append(Calendar *c, char *name, BlistTag t) {
bd = (BlistData *)ckalloc(sizeof(BlistData));
bd->name = cm_strdup(name);
bd->tag = t;
bd->cal_handle = NULL;
bd->cal_handle = 0;
CmDataListAdd(bl->blist_data, (void *)bd, location);
return location;
@@ -290,7 +290,7 @@ blist_addname(Widget widget, XtPointer client_data, XtPointer cbs) {
((*(end_ptr - 1) == ' ') || (*(end_ptr - 1) == '\t')))
end_ptr--;
*end_ptr = NULL;
*end_ptr = '\0';
if (blank_buf(new_name)) {
@@ -453,7 +453,7 @@ blist_init_names(Calendar *c) {
blist_name_append(c, get_char_prop(p, CP_DEFAULTCAL), BLIST_ACTIVE);
namelist = cm_strdup(get_char_prop(p, CP_DAYCALLIST));
if (namelist == NULL || *namelist == NULL )
if (namelist == NULL || *namelist == '\0' )
return;
name = strtok(namelist, " ");
@@ -496,7 +496,7 @@ blist_clean(Browselist *bl, Boolean clean_all) {
cnt = bl->blist_data->count;
for (i = 1; i <= cnt; i++) {
bd = (BlistData *)CmDataListGetData(bl->blist_data, left_cnt);
if (bd && bd->cal_handle == NULL &&
if (bd && bd->cal_handle == 0 &&
(clean_all || bd->tag != BLIST_ACTIVE)) {
if (bd->name)
free(bd->name);

12
cde/programs/dtcm/dtcm/browser.c
View File

@@ -376,7 +376,7 @@ make_browser(Calendar *c)
* remember - this returns a RowColumn widget!
*/
b->gotomenu = XmVaCreateSimpleOptionMenu(b->upper_form,
"goToOptionMenu", goto_label, NULL, 0, gotomenu_cb,
"goToOptionMenu", goto_label, 0, 0, gotomenu_cb,
XmVaPUSHBUTTON, prev_week, NULL, NULL, NULL,
XmVaPUSHBUTTON, this_week, NULL, NULL, NULL,
XmVaPUSHBUTTON, next_week, NULL, NULL, NULL,
@@ -749,7 +749,7 @@ void mb_update_busystatus(Browser *b, Calendar *c)
if (bd->cache == NULL) {
setup_range(&range_attrs, &ops, &r_cnt, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, bd->version);
CSA_TYPE_EVENT, 0, B_FALSE, bd->version);
stat = csa_list_entries(bd->cal_handle, r_cnt, range_attrs, ops, &num_entries, &entries, NULL);
free_range(&range_attrs, &ops, r_cnt);
backend_err_msg(b->frame, bd->name, stat,
@@ -884,7 +884,7 @@ get_mail_address_list(Calendar *c) {
}
address = calloc(address_len+1, 1);
address[0] = NULL;
address[0] = '\0';
for (i = 0; i < pos_cnt; i++) {
bd = (BlistData *)CmDataListGetData(bl->blist_data,
@@ -972,7 +972,7 @@ nt */
static void
gotomenu_cb(Widget w, XtPointer data, XtPointer cbs)
{
int item_no = (int) data;
int item_no = (int) (intptr_t) data;
/* should really be getting this from the widget */
Calendar *c = calendar;
@@ -1061,7 +1061,7 @@ mb_update_array(char *entry_text, Calendar *c)
if (bd->cache == NULL) {
setup_range(&range_attrs, &ops, &r_cnt, start,
stop, CSA_TYPE_EVENT,
NULL, B_FALSE, bd->version);
0, B_FALSE, bd->version);
stat = csa_list_entries(bd->cal_handle, r_cnt, range_attrs,
ops, &num_entries, &entries, NULL);
free_range(&range_attrs, &ops, r_cnt);
@@ -1216,7 +1216,7 @@ mb_deregister_names(char *name, Calendar *c)
backend_err_msg(b->frame, bd->name, stat,
p->xm_error_pixmap);
}
bd->cal_handle = NULL;
bd->cal_handle = '\0';
blist_clean(bl, False);
}
}

28
cde/programs/dtcm/dtcm/calendarA.c
View File

@@ -964,25 +964,25 @@ set_default_view(Calendar *c)
*/
void view_day_cb(Widget w, XtPointer data, XtPointer cbs)
{
if ((int) data == 0)
if ((intptr_t) data == 0)
day_button(w, data, cbs);
}
void view_week_cb(Widget w, XtPointer data, XtPointer cbs)
{
if ((int) data == 0)
if ((intptr_t) data == 0)
week_button(w, data, cbs);
}
void view_month_cb(Widget w, XtPointer data, XtPointer cbs)
{
if ((int) data == 0)
if ((intptr_t) data == 0)
month_button(w, data, cbs);
}
void view_year_cb( Widget w, XtPointer data, XtPointer cbs)
{
if ((int) data == 0)
if ((intptr_t) data == 0)
(void) year_button(w, data, cbs);
}
@@ -1112,9 +1112,9 @@ edit_cb( Widget w, XtPointer item_no, XtPointer cbs)
Calendar *c = calendar;
_DtTurnOnHourGlass(c->frame);
if ((int) item_no == 1)
if ((intptr_t) item_no == 1)
show_props_pu(c);
else if ((int) item_no == 3)
else if ((intptr_t) item_no == 3)
make_find(c);
_DtTurnOffHourGlass(c->frame);
}
@@ -1175,7 +1175,7 @@ appt_cb(Widget w, XtPointer item_no, XtPointer cbs)
Calendar *c = calendar;
_DtTurnOnHourGlass(c->frame);
switch((int) item_no) {
switch((intptr_t) item_no) {
case 0:
show_editor(c, 0, 0, False);
break;
@@ -1223,7 +1223,7 @@ edit_menu_cb(Widget w, XtPointer cl_data, XtPointer cbs)
static void
browse_cb(Widget w, XtPointer client_data, XtPointer cbs) {
int rcode, idx = (int)client_data;
int rcode, idx = (int) (intptr_t) client_data;
char buf[MAXNAMELEN];
Calendar *c = calendar;
Props_pu *p = (Props_pu *)c->properties_pu;
@@ -1556,7 +1556,7 @@ update_browse_menu_names(Calendar *c) {
str = (!strcmp(bd->name, c->calname)) ? "calName" : "myName";
item = XmCreatePushButtonGadget(c->browse_menu, str, al, ac);
XtAddCallback(item, XmNactivateCallback, browse_cb,
(XtPointer)i);
(XtPointer) (intptr_t) i);
XmStringFree(xmstr);
}
@@ -2160,12 +2160,12 @@ open_user_calendar(Calendar *c, Boolean retry)
NULL, NULL);
/* create the calendar */
if ((status = csa_add_calendar(NULL, &csa_user, 1, &attr, NULL))
if ((status = csa_add_calendar(0, &csa_user, 1, &attr, NULL))
== CSA_E_UNSUPPORTED_ATTRIBUTE) {
/* server with version 4 or less does not support
* the CSA_CAL_ATTR_CHARACTER_SET cal attribute
*/
status = csa_add_calendar(NULL, &csa_user, 0, NULL,
status = csa_add_calendar(0, &csa_user, 0, NULL,
NULL);
}
if (val.item.string_value) free(val.item.string_value);
@@ -2294,7 +2294,7 @@ logon_retry(XtPointer data, XtIntervalId *dummy)
{
Calendar *c = (Calendar *)data;
/* retry once */
if (c->my_cal_handle == NULL && (open_user_calendar(c, False) == True))
if (c->my_cal_handle == 0 && (open_user_calendar(c, False) == True))
{
_DtTurnOnHourGlass(c->frame);
reset_timer(c);
@@ -2461,7 +2461,7 @@ get_user_calendar()
uname = cm_get_uname();
if ((loc = get_char_prop((Props *)calendar->properties, CP_CALLOC)) &&
*loc != NULL) {
*loc != '\0') {
loc = strdup(loc);
needfree = True;
} else
@@ -2559,7 +2559,7 @@ init_calendar(argc, argv)
while (*s_ptr)
*d_ptr++ = *s_ptr++;
*d_ptr++ = NULL;
*d_ptr++ = '\0';
}
d_ptr = NULL;

4
cde/programs/dtcm/dtcm/cm_delete.c
View File

@@ -118,7 +118,7 @@ cm_args(int argc, char **argv)
argv = grab(++argv,cm_view,'-');
break;
default:
fprintf(stderr,catgets(DT_catd, 1, 187, "Usage:\n\tdtcm_delete [-c calendar] [-d <mm/dd/yy>] [-v view]\n"));
fprintf(stderr, "%s", catgets(DT_catd, 1, 187, "Usage:\n\tdtcm_delete [-c calendar] [-d <mm/dd/yy>] [-v view]\n"));
exit(1);
}
}
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
free(loc);
exit(0);
}
fprintf(stdout, catgets(DT_catd, 1, 190,
fprintf(stdout, "%s", catgets(DT_catd, 1, 190,
"Item to delete (number)? "));
fgets(index, 9, stdin);
fprintf(stdout,"\n\n");

2
cde/programs/dtcm/dtcm/cm_insert.c
View File

@@ -225,7 +225,7 @@ prompt_for_insert(Props *p) {
printf("%s", catgets(DT_catd, 1, 205,
"What (you may enter up to 5 lines, use ^D to finish):\n"));
cm_what[0] = NULL;
cm_what[0] = '\0';
for (index = 0; index < 5; index++)
{
*what_buffer = '\0';

2
cde/programs/dtcm/dtcm/cm_lookup.c
View File

@@ -115,7 +115,7 @@ cm_args(int argc, char **argv)
argv = grab(++argv,cm_view,'-');
break;
default:
fprintf(stderr,catgets(DT_catd, 1, 207, "Usage:\n\tdtcm_lookup [ -c calendar ][ -d <mm/dd/yy> ] [ -v view ]\n"));
fprintf(stderr, "%s", catgets(DT_catd, 1, 207, "Usage:\n\tdtcm_lookup [ -c calendar ][ -d <mm/dd/yy> ] [ -v view ]\n"));
exit(1);
}
}

12
cde/programs/dtcm/dtcm/dayglance.c
View File

@@ -211,7 +211,7 @@ paint_dayview_appts(Calendar *c, Paint_cache *cache, int a_total, void *rect)
for (i = begin_time - 1; i < end_time; i++) {
hr = i;
if (i < begin_time)
(void) sprintf(buf, "");
buf[0] = '\0';
else if (disp_t == HOUR12) {
am = adjust_hour(&hr);
(void) sprintf(buf, "%d%s", hr, am ? "a" : "p");
@@ -267,7 +267,7 @@ paint_dayview_appts(Calendar *c, Paint_cache *cache, int a_total, void *rect)
appt_str, end_tick,
cache[i].show_time, disp_t);
}
appt_str[cm_strlen(appt_str)]=NULL;
appt_str[cm_strlen(appt_str)] = '\0';
/* REVISIT: unclear why we're still distinguishing between gr_text[_rgb]
if (c->xcontext->screen_depth >= 8)
@@ -337,7 +337,7 @@ paint_dayview_appts(Calendar *c, Paint_cache *cache, int a_total, void *rect)
appt_str, end_tick,
cache[i].show_time, disp_t);
}
appt_str[cm_strlen(appt_str)]=NULL;
appt_str[cm_strlen(appt_str)] = '\0';
/* REVISIT: unclear why we're still distinguishing between gr_text[_rgb]
if (c->xcontext->screen_depth >= 8)
@@ -620,7 +620,7 @@ paint_dayview(Calendar *c, Boolean repaint, XRectangle *rect, Boolean update_mon
if (c->paint_cache == NULL) {
start = (time_t) lower_bound(0, c->view->date);
stop = (time_t) next_nhours(start, end+1) - 1;
setup_range(&range_attrs, &ops, &j, start, stop, CSA_TYPE_EVENT, NULL,
setup_range(&range_attrs, &ops, &j, start, stop, CSA_TYPE_EVENT, 0,
B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs, ops, &a_total, &list, NULL);
@@ -811,7 +811,7 @@ count_day_pages(Calendar *c, int lines_per_page, Tick tick)
start = (time_t) lower_bound(i, tick);
end = (time_t) next_nhours(start+1, 1) - 1;
setup_range(&range_attrs, &ops, &j, start, end,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs, ops, &a_total, &list, NULL);
free_range(&range_attrs, &ops, j);
@@ -888,7 +888,7 @@ _print_day(Calendar *c,
start = (time_t) lower_bound(i, tick);
stop = (time_t) next_nhours(start+1, 1) - 1;
setup_range(&range_attrs, &ops, &j, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs,
ops, &a_total, &list, NULL);

16
cde/programs/dtcm/dtcm/dnd.c
View File

@@ -178,7 +178,7 @@ handle_animate_cb(
drag_load_proc(dnd_filename, c);
unlink(dnd_filename);
dnd_filename[0] = NULL;
dnd_filename[0] = '\0';
break;
default:
return;
@@ -257,7 +257,7 @@ handle_drop_cb(
if (validate_dropped_appt(dnd_filename, c) == False) {
unlink(dnd_filename);
dnd_filename[0] = NULL;
dnd_filename[0] = '\0';
transfer_info->status = DtDND_FAILURE;
}
#ifdef NOT
@@ -547,7 +547,7 @@ get_appt_struct(DragContext *context) {
XtFree(ident);
XtFree(text);
XtFree(title);
return(NULL);
return(0);
}
@@ -577,7 +577,7 @@ get_appt_struct(DragContext *context) {
XtFree(ident);
XtFree(title);
XtFree((XtPointer)item_list);
return(NULL);
return(0);
}
return entry;
@@ -630,11 +630,11 @@ GetIcon(Calendar *calendar)
Editor *e = (Editor *) calendar->editor;
GEditor *ge = (GEditor *) calendar->geditor;
if (e->drag_bitmap == NULL) {
if (e->drag_bitmap == 0) {
e->drag_bitmap = XCreateBitmapFromData(display,
window, (char *) drag_xbm_bits,
drag_xbm_width, drag_xbm_height);
if (e->drag_bitmap == NULL) {
if (e->drag_bitmap == 0) {
printf("%s", catgets(calendar->DT_catd, 1, 237, "XCreateBitmapFromData() failed for bitmap.\n"));
return;
@@ -642,11 +642,11 @@ GetIcon(Calendar *calendar)
else
ge->drag_bitmap = e->drag_bitmap;
}
if (e->drag_mask == NULL) {
if (e->drag_mask == 0) {
e->drag_mask = XCreateBitmapFromData(display,
window, (char *) drag_mask_xbm_bits,
drag_mask_xbm_width, drag_mask_xbm_height);
if (e->drag_mask == NULL) {
if (e->drag_mask == 0) {
printf("%s", catgets(calendar->DT_catd, 1, 238, "XCreateBitmapFromData() failed for mask.\n"));
return;
}

12
cde/programs/dtcm/dtcm/dssw.c
View File

@@ -116,8 +116,8 @@ dssw_set_start_hour(Widget w, XtPointer client_data, XtPointer cbs) {
XtVaGetValues(w, XmNuserData, &user_data, NULL);
if (user_data == NO_TIME) {
sprintf(dssw->start_val.val, "\0");
sprintf(dssw->stop_val.val, "\0");
dssw->start_val.val[0] = '\0';
dssw->stop_val.val[0] = '\0';
dssw->start_val.block = dssw->stop_val.block = TIME_AM;
} else if (user_data == ALL_DAY) {
if (dt == HOUR12) {
@@ -172,7 +172,7 @@ dssw_set_stop_hour(Widget w, XtPointer client_data, XtPointer cbs) {
XtVaGetValues(w, XmNuserData, &user_data, NULL);
if (user_data == NO_TIME) {
sprintf(dssw->stop_val.val, "\0");
dssw->stop_val.val[0] = '\0';
dssw->stop_val.block = TIME_AM;
} else {
hrs = user_data / hrsec;
@@ -693,7 +693,7 @@ dssw_form_to_todo(DSSW *dssw, Dtcm_appointment *a, char *name, Tick t)
* Todo does not have end time. So to distinguish between this
* and the editor, zero this out.
*/
sprintf(dssw->stop_val.val, "\0");
dssw->stop_val.val[0] = '\0';
if (blank_buf(dssw->date_val)) {
editor_err_msg(dssw->parent, name, MISSING_DATE,
pu->xm_error_pixmap);
@@ -833,7 +833,7 @@ dssw_attrs_to_form(DSSW *dssw, Dtcm_appointment *appt) {
minute(end_tick));
} else {
/* no end time */
sprintf(dssw->stop_val.val, "\0");
dssw->stop_val.val[0] = '\0';
dssw->stop_val.block = TIME_AM;
}
}
@@ -842,7 +842,7 @@ dssw_attrs_to_form(DSSW *dssw, Dtcm_appointment *appt) {
if (what) {
strncpy(dssw->what_val, what, WHAT_LEN - 1);
dssw->what_val[WHAT_LEN-1] = NULL;
dssw->what_val[WHAT_LEN-1] = '\0';
}
set_dssw_vals(dssw, tick);

14
cde/programs/dtcm/dtcm/dtcm_editor.c
View File

@@ -244,22 +244,22 @@ GetIcon(DTCM_editor *de)
Window window = XtWindow(calendar->frame);
unsigned char *bitmapData, *bitmapMask;
if (de->drag_bitmap == NULL) {
if (de->drag_bitmap == 0) {
de->drag_bitmap = XCreateBitmapFromData(display,
window, (char *) drag_xbm_bits,
drag_xbm_width, drag_xbm_height);
if (de->drag_bitmap == NULL) {
if (de->drag_bitmap == 0) {
printf(catgets(calendar->DT_catd, 1, 237, "XCreateBitmapFromData() failed for bitmap.\n"));
printf("%s", catgets(calendar->DT_catd, 1, 237, "XCreateBitmapFromData() failed for bitmap.\n"));
return;
}
}
if (de->drag_mask == NULL) {
if (de->drag_mask == 0) {
de->drag_mask = XCreateBitmapFromData(display,
window, (char *) drag_mask_xbm_bits,
drag_mask_xbm_width, drag_mask_xbm_height);
if (de->drag_mask == NULL) {
printf(catgets(calendar->DT_catd, 1, 238, "XCreateBitmapFromData() failed for mask.\n"));
if (de->drag_mask == 0) {
printf("%s", catgets(calendar->DT_catd, 1, 238, "XCreateBitmapFromData() failed for mask.\n"));
return;
}
}
@@ -394,7 +394,7 @@ StandaloneApptDragStart(
NULL)
== NULL) {
printf(catgets(c->DT_catd, 1, 239, "DragStart returned NULL.\n"));
printf("%s", catgets(c->DT_catd, 1, 239, "DragStart returned NULL.\n"));
}
}

4
cde/programs/dtcm/dtcm/editor.c
View File

@@ -1210,7 +1210,7 @@ build_editor_list(Editor *e, Tick date, Glance glance,
}
setup_range(&range_attr, &ops, &range_count, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, e->cal->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, e->cal->general->version);
status = csa_list_entries(e->cal->cal_handle, range_count, range_attr, ops, count, entry_list, NULL);
backend_err_msg(e->frame, e->cal->view->current_calendar, status,
@@ -1409,7 +1409,7 @@ trim_end_date_from_rule(char *rule, char *newrule)
if (ptr = strchr(rule, 'Z')) {
while (*ptr != ' ')
ptr--;
*ptr = NULL;
*ptr = '\0';
}
strcpy(newrule, rule);

6
cde/programs/dtcm/dtcm/find.c
View File

@@ -587,7 +587,7 @@ XmPushButtonCallbackStruct *cbs;
astr = XmTextGetString(f->apptstr);
if (astr == NULL || *astr == NULL) {
if (astr == NULL || *astr == '\0') {
sprintf(message, "%s", catgets(c->DT_catd, 1, 290, "Specify Appt String to Match."));
set_message(f->find_message, message);
return;
@@ -666,7 +666,7 @@ XmPushButtonCallbackStruct *cbs;
_DtTurnOnHourGlass(f->frame);
for (; stop <= end_of_time;) {
setup_range(&range_attrs, &ops, &range_count, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
stat = csa_list_entries(c->cal_handle, range_count, range_attrs, ops, &num_entries, &entries, NULL);
if (stat != CSA_SUCCESS) {
@@ -684,7 +684,7 @@ XmPushButtonCallbackStruct *cbs;
return;
}
for (j = 0; appt->what->value->item.string_value[j] != NULL; j++)
for (j = 0; appt->what->value->item.string_value[j] != '\0'; j++)
if (strncasecmp(astr, &(appt->what->value->item.string_value[j]),
comparison_length) == 0) {
new_tick = (Tick_list *) ckalloc(sizeof(Tick_list));

4
cde/programs/dtcm/dtcm/font.c
View File

@@ -275,12 +275,12 @@ load_app_font(
* version available.
*/
if (!strcmp(cal->app_data->app_font_family, "application")) {
sprintf (font_name, "-dt-%s-%s-r-normal-sans-%d-*-*-*-p-*",
sprintf (font_name, "-dt-%s-%s-r-normal-sans-%lu-*-*-*-p-*",
cal->app_data->app_font_family,
(weight == BOLD)?"bold":"medium",
pixel_size);
} else {
sprintf (font_name, "-dt-%s-%s-r-normal--%d-*-*-*-*-*",
sprintf (font_name, "-dt-%s-%s-r-normal--%lu-*-*-*-*-*",
cal->app_data->app_font_family,
(weight == BOLD)?"bold":"medium",
pixel_size);

18
cde/programs/dtcm/dtcm/format.c
View File

@@ -85,7 +85,7 @@ format_date(Tick t, OrderingType order, char *buf, int day_and_date,
struct tm *tm;
_Xltimeparams localtime_buf;
buf[0]=NULL;
buf[0] = '\0';
tm = _XLocaltime(&t, localtime_buf);
m = tm->tm_mon+1;
d = tm->tm_mday;
@@ -157,7 +157,7 @@ format_date3(Tick t, OrderingType order, SeparatorType sep, char *buf)
char *str = (char *) separator_str(sep);
_Xltimeparams localtime_buf;
buf[0]=NULL;
buf[0] = '\0';
tm = _XLocaltime(&t, localtime_buf);
m = tm->tm_mon+1;
@@ -194,7 +194,7 @@ format_line(Tick tick,
_Xltimeparams localtime_buf;
if (buf==NULL) return pad;
buf[0]=NULL;
buf[0] = '\0';
tm = _XLocaltime(&tick, localtime_buf);
hr = tm->tm_hour;
mn = tm->tm_min;
@@ -227,16 +227,16 @@ format_line(Tick tick,
width, so I have to line it up myself.. */
if (display == HOUR12) {
if (hr > 9)
(char *)sprintf(buf, "%2d:%.2d%s ",
sprintf(buf, "%2d:%.2d%s ",
hr, mn, am ? "a" : "p");
else {
(char *)sprintf(buf, "%d:%.2d%s ",
sprintf(buf, "%d:%.2d%s ",
hr, mn, am ? "a" : "p");
pad = TRUE;
}
}
else
(char *)sprintf(buf, "%02d%02d ", hr, mn);
sprintf(buf, "%02d%02d ", hr, mn);
}
}
if (what)
@@ -262,7 +262,7 @@ format_maxchars(Dtcm_appointment *appt, char *buf1, int maxchars,
if (appt->end_time)
_csa_iso8601_to_tick(appt->end_time->value->item.string_value,
&end_tick);
*buf1 = NULL;
*buf1 = '\0';
if (appt == NULL || appt->what->value->item.string_value == NULL) return;
tm = _XLocaltime(&tick, localtime_buf);
hour1 = tm->tm_hour;
@@ -336,7 +336,7 @@ format_line2(Dtcm_appointment *appt, char *buf1, char *buf2,
* Extract an appointment and format it into 2 lines of no more
* then maxchars
*/
*buf1 = *buf2 = NULL;
*buf1 = *buf2 = '\0';
if (appt == NULL || appt->what->value->item.string_value == NULL) return;
tm = _XLocaltime(&tick, localtime_buf);
hour1 = tm->tm_hour;
@@ -382,7 +382,7 @@ format_line2(Dtcm_appointment *appt, char *buf1, char *buf2,
if (lines == NULL || lines->s == NULL ||
(cm_strlen(lines->s) == 1 && lines->s[0] == ' '))
buf2[0] = NULL;
buf2[0] = '\0';
else
sprintf(buf2, " %s", lines->s);
destroy_lines(lines);

2
cde/programs/dtcm/dtcm/goto.c
View File

@@ -258,7 +258,7 @@ goto_date(Widget widget, XtPointer client_data, XmPushButtonCallbackStruct *cbs)
g = (Goto*)c->goTo;
date = XmTextGetString(g->datetext);
if ((*date == NULL) || (date == NULL)) {
if ((date == NULL) || (*date == '\0')) {
sprintf(message, "%s", catgets(c->DT_catd, 1, 297, "Please type in a date"));
set_message(g->goto_message, message);
return;

2
cde/programs/dtcm/dtcm/graphics.c
View File

@@ -629,7 +629,7 @@ gr_create_stipple(new_XContext *xc, unsigned char *data, int datawidth, int data
if ((*stipple = XCreateBitmapFromData(xc->display,
xc->xid,
/* RootWindow(xc->display, DefaultScreen(xc->display)), */
(char *)data, datawidth, dataheight)) == NULL) {
(char *)data, datawidth, dataheight)) == 0) {
ok = False;
}
else {

4
cde/programs/dtcm/dtcm/group_editor.c
View File

@@ -315,7 +315,7 @@ get_mail_address_list(Calendar *c) {
}
address = calloc(address_len+1, 1);
memset(address, NULL, address_len);
memset(address, 0, address_len);
for (i = 0; i < pos_cnt; i++) {
ad = (Access_data *)CmDataListGetData(ge->access_data,
@@ -1803,7 +1803,7 @@ add_all_gappt(GEditor *ge) {
continue;
setup_range(&range_attr, &ops, &range_count, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, step->version);
CSA_TYPE_EVENT, 0, B_FALSE, step->version);
csa_list_entries(step->cal_handle, range_count, range_attr,
ops, &entry_count, &entry_list, NULL);
free_range(&range_attr, &ops, range_count);

4
cde/programs/dtcm/dtcm/help.c
View File

@@ -120,7 +120,7 @@ void show_main_help(Widget w, XtPointer clientData, XtPointer cbs)
ac = 0;
XtSetArg(al[ac], DtNhelpType, DtHELP_TYPE_TOPIC); ac++;
switch ((int)clientData) {
switch ((intptr_t)clientData) {
case HELP_OVERVIEW:
XtSetArg(al[ac], DtNhelpVolume, "Calendar"); ac++;
XtSetArg(al[ac], DtNlocationId, "_HOMETOPIC"); ac++;
@@ -149,7 +149,7 @@ void show_main_help(Widget w, XtPointer clientData, XtPointer cbs)
while (!XtIsSubclass(w, applicationShellWidgetClass))
w = XtParent(w);
status = DtHelpReturnSelectedWidgetId(w, NULL, &selWidget);
status = DtHelpReturnSelectedWidgetId(w, 0, &selWidget);
switch ((int)status)
{
case DtHELP_SELECT_ERROR:

16
cde/programs/dtcm/dtcm/icon.c
View File

@@ -160,8 +160,8 @@ load_icons(
/* See if the resolution size we have chosen is acceptable by the WM */
if (!(size = wm_icon_preference(XtDisplay(c->frame), screen, size))) {
c->icon->icon = NULL;
c->icon_inverted->icon = NULL;
c->icon->icon = 0;
c->icon_inverted->icon = 0;
return (FALSE);
}
@@ -205,22 +205,22 @@ load_icon(
if (!(icon_filename = XmGetIconFileName(screen, NULL, icon_name,
NULL, size))) {
icon->icon = NULL;
icon->icon = 0;
return (FALSE);
}
if ((icon->icon = XmGetPixmap(screen, icon_filename, fg, bg)) ==
XmUNSPECIFIED_PIXMAP) {
free(icon_filename);
icon->icon = NULL;
icon->icon = 0;
return (FALSE);
}
if ((icon->icon_mask = _DtGetMask(screen, icon_filename)) ==
XmUNSPECIFIED_PIXMAP) {
free(icon_filename);
icon->icon = NULL;
icon->icon_mask = NULL;
icon->icon = 0;
icon->icon_mask = 0;
return (FALSE);
}
@@ -247,12 +247,12 @@ free_icon(
if (icon->icon)
XmDestroyPixmap(XtScreen(c->frame), icon->icon);
icon->icon = NULL;
icon->icon = 0;
if (icon->icon_mask)
XmDestroyPixmap(XtScreen(c->frame), icon->icon_mask);
icon->icon_mask = NULL;
icon->icon_mask = 0;
}
static void

6
cde/programs/dtcm/dtcm/misc.c
View File

@@ -583,7 +583,7 @@ create_all_pixmaps(Props_pu *p, Widget w)
if ((p->drag_icon_xbm = XmGetPixmap(s, "DtCMdnd.m.pm", fg, bg)) ==
XmUNSPECIFIED_PIXMAP) {
p->drag_icon_xbm = NULL;
p->drag_icon_xbm = 0;
}
}
@@ -663,10 +663,10 @@ cm_mbchar(char *str) {
static void
response(Widget w, XtPointer client_data, XtPointer cbs) {
XtPointer userData = (XtPointer)0;
int *answerP = (int *)client_data;
int *answerP = (int *) (intptr_t)client_data;
XtVaGetValues(w, XmNuserData, &userData, NULL);
*answerP = (int)userData;
*answerP = (intptr_t)userData;
}
/*

16
cde/programs/dtcm/dtcm/monthglance.c
View File

@@ -209,14 +209,14 @@ paint_day_entries(
w - pad_width,
buf, pf);
if (cm_strlen(buf) > maxchars)
buf[maxchars] = NULL;
buf[maxchars] = '\0';
(void)gr_text(xc, x + pad_width,
y, pf, buf, rect);
} else {
maxchars = gr_nchars(w, buf,
pf);
if (cm_strlen(buf) > maxchars)
buf[maxchars] = NULL;
buf[maxchars] = '\0';
(void)gr_text(xc, x, y, pf,
buf, rect);
}
@@ -306,7 +306,7 @@ paint_month(Calendar *c, Tick key, XRectangle *rect)
start = (time_t) lowerbound(day);
stop = (time_t) last_dom(day);
setup_range(&range_attrs, &ops, &j, start, stop, CSA_TYPE_EVENT,
NULL, B_FALSE, c->general->version);
0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs, ops, &a_total, &list, NULL);
free_range(&range_attrs, &ops, j);
@@ -571,7 +571,7 @@ get_time_str (Dtcm_appointment *appt, char *buf)
_Xltimeparams localtime_buf;
_csa_iso8601_to_tick(appt->time->value->item.date_time_value, &start_tick);
buf[0] = NULL;
buf[0] = '\0';
if (appt==NULL || !showtime_set(appt) || magic_time(start_tick))
return;
@@ -724,7 +724,7 @@ count_month_pages(Calendar *c, Tick start_date, int lines_per_box)
start = (time_t) lowerbound (day);
stop = (time_t) next_ndays(day, 1) - 1;
setup_range(&range_attrs, &ops, &j, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE,
CSA_TYPE_EVENT, 0, B_FALSE,
c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs, ops,
&a_total, &list, NULL);
@@ -804,7 +804,7 @@ print_month ( Calendar *c,
lo_hour = (time_t)lowerbound (day);
hi_hour = (time_t) next_ndays(day, 1) - 1;
setup_range(&range_attrs, &ops, &j, lo_hour, hi_hour,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs,
ops, &a_total, &list, NULL);
free_range(&range_attrs, &ops, j);
@@ -924,7 +924,7 @@ static void
quick_button_cb(Widget widget, XtPointer client, XtPointer call)
{
Calendar *c = calendar;
int dom = (int) client;
int dom = (int) (intptr_t) client;
c->view->olddate = c->view->date;
c->view->date = next_ndays(first_dom(c->view->date), dom);
@@ -1059,7 +1059,7 @@ allocator(Calendar *c)
XmCreatePushButton(c->canvas, buf, NULL, 0);
XtVaSetValues(m->hot_button[n], XmNlabelString, str, NULL);
XtAddCallback(m->hot_button[n],XmNactivateCallback,
quick_button_cb, (XtPointer)n);
quick_button_cb, (XtPointer) (intptr_t) n);
XmStringFree(str);
}
}

5
cde/programs/dtcm/dtcm/print.c
View File

@@ -29,6 +29,7 @@
*/
#include <EUSCompat.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -984,7 +985,7 @@ create_print_dialog(Calendar *c)
*/
pd->report_type = PR_DAY_VIEW;
pd->report_type_option = XmVaCreateSimpleOptionMenu(pd->form,
"TypeOptionMenu", view, NULL,
"TypeOptionMenu", view, 0,
pd->report_type, report_option_cb,
XmVaPUSHBUTTON, day_view, NULL, NULL, NULL,
XmVaPUSHBUTTON, week_view, NULL, NULL, NULL,
@@ -1489,7 +1490,7 @@ print_report(Calendar *c)
static void
report_option_cb(Widget w, XtPointer client_data, XtPointer call_data)
{
int choice = (int) client_data;
int choice = (int) (intptr_t) client_data;
Calendar *c = calendar;
pd_set_report_managed(c, choice);

2
cde/programs/dtcm/dtcm/props_pu.c
View File

@@ -2404,7 +2404,7 @@ p_make_props_pu(Calendar *c) {
p->category_menu = widgets[0] =
XmVaCreateSimpleOptionMenu(p->base_form_mgr,
"category_menu", label, NULL, 0, p_category_notify,
"category_menu", label, 0, 0, p_category_notify,
XmVaPUSHBUTTON, Pane_XmStrs[EDITOR_PANE], NULL, NULL, NULL,
XmVaPUSHBUTTON, Pane_XmStrs[DISPLAY_PANE], NULL, NULL, NULL,
XmVaPUSHBUTTON, Pane_XmStrs[GROUP_ACCESS_PANE], NULL, NULL,NULL,

4
cde/programs/dtcm/dtcm/session.c
View File

@@ -176,7 +176,7 @@ CMSaveSessionCB (
if (save_session) {
memcpy(command + command_len, "-session", 8);
command_len += 8;
command[command_len] = NULL;
command[command_len] = '\0';
command_len++;
memcpy(command + command_len, name, strlen(name));
command_len += strlen(name);
@@ -234,7 +234,7 @@ GetSessionInfo(
if (path) XtFree(path);
xrm_name[1] = NULL;
xrm_name[1] = '\0';
/* get default view */
xrm_name[0] = XrmStringToQuark ("defaultView");

11
cde/programs/dtcm/dtcm/submit.c
View File

@@ -54,6 +54,7 @@
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/wait.h>
#include <LocaleXlate.h>
#include <RFCMIME.h>
@@ -372,7 +373,10 @@ deliver(char ** addrs, char * msg)
}
argv[cp + 1] = NULL;
pipe(fd);
if(-1 == pipe(fd)) {
fprintf(stderr, "pipe() failed %d '%s'\n", errno, strerror(errno));
exit(EXIT_FAILURE);
}
c_pid = fork();
if (c_pid < 0) {
@@ -386,7 +390,10 @@ deliver(char ** addrs, char * msg)
_exit(1); /* This had better never happen! */
}
else { /* The parent. */
write(fd[1], msg, strlen(msg));
if(-1 == write(fd[1], msg, strlen(msg))) {
fprintf(stderr, "write() failed %d '%s'\n", errno, strerror(errno));
exit(EXIT_FAILURE);
}
close(fd[0]);
close(fd[1]);

6
cde/programs/dtcm/dtcm/todo.c
View File

@@ -2224,7 +2224,7 @@ build_todo_view(ToDo *t, Glance glance, Boolean redisplay) {
XmNvalueChangedCallback, t_view_change_proc, t);
step->next = NULL;
step->appt = NULL;
step->appt = 0;
if (last) {
XtVaSetValues(step->view_item_number,
XmNtopAttachment, XmATTACH_WIDGET,
@@ -2241,7 +2241,7 @@ build_todo_view(ToDo *t, Glance glance, Boolean redisplay) {
XtManageChild(step->view_item_number);
XtManageChild(step->view_item_toggle);
}
if (step->appt != NULL)
if (step->appt != 0)
csa_free((CSA_buffer) step->appt);
step->appt = entry_list[cnt - 1];
step->modified = False;
@@ -2294,7 +2294,7 @@ build_todo_view(ToDo *t, Glance glance, Boolean redisplay) {
** possibly filled with old stuff -- unmanage these widgets.
*/
while (step) {
if (step->appt != NULL)
if (step->appt != 0)
csa_free((CSA_buffer) step->appt);
XtUnmanageChild(step->view_item_number);
XtUnmanageChild(step->view_item_toggle);

22
cde/programs/dtcm/dtcm/weekglance.c
View File

@@ -157,7 +157,7 @@ count_week_pages (Calendar *c, int lines_per_page, Tick start_date)
start = (time_t) lowerbound (start_date);
stop = (time_t) next_ndays(start_date, 1) - 1;
setup_range(&range_attrs, &ops, &j, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs, ops, &a_total, &list, NULL);
free_range(&range_attrs, &ops, j);
@@ -250,7 +250,7 @@ print_week (Calendar *c,
start = (time_t) lowerbound (start_date);
stop = (time_t) next_ndays(start_date, 1) - 1;
setup_range(&range_attrs, &ops, &j, start, stop,
CSA_TYPE_EVENT, NULL, B_FALSE, c->general->version);
CSA_TYPE_EVENT, 0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, j, range_attrs,
ops, &a_total, &list, NULL);
free_range(&range_attrs, &ops, j);
@@ -459,7 +459,7 @@ allocator(Calendar *c)
w->hot_button[n] =
XmCreatePushButton(c->canvas, "week2day", args, 1);
XtAddCallback(w->hot_button[n],XmNactivateCallback,
quick_button_cb, (XtPointer)n);
quick_button_cb, (XtPointer) (intptr_t) n);
}
/* selection info (and init its permanent attributes) */
@@ -864,7 +864,7 @@ draw_week(Calendar *c, XRectangle *rect, Boundary boundary)
if (c->paint_cache == NULL) {
setup_range(&range_attrs, &ops, &i, start, stop, CSA_TYPE_EVENT,
NULL, B_FALSE, c->general->version);
0, B_FALSE, c->general->version);
csa_list_entries(c->cal_handle, i, range_attrs, ops,
&a_total, &list, NULL);
free_range(&range_attrs, &ops, i);
@@ -1031,7 +1031,7 @@ format_entry(Paint_cache *cache_entry, char *buf1, char *buf2,
* Extract an appointment and format it into 2 lines of no more
* then maxchars
*/
*buf1 = *buf2 = NULL;
*buf1 = *buf2 = '\0';
if (cache_entry == NULL || cache_entry->summary == NULL) return;
tm = _XLocaltime(&tick, localtime_buf);
hour1 = tm->tm_hour;
@@ -1076,7 +1076,7 @@ format_entry(Paint_cache *cache_entry, char *buf1, char *buf2,
if (lines == NULL || lines->s == NULL ||
(cm_strlen(lines->s) == 1 && lines->s[0] == ' '))
buf2[0] = NULL;
buf2[0] = '\0';
else
sprintf(buf2, " %s", lines->s);
destroy_lines(lines);
@@ -1100,15 +1100,15 @@ paint_entry(Calendar *c, int x, int y, int maxchars, Paint_cache *cache_entry, X
if (maxchars >= 40) /* maxed out possible=40 */
maxchars = 40;
buf1[0]=NULL; buf2[0]=NULL;
buf1[0] = '\0'; buf2[0] = '\0';
format_entry(cache_entry, buf1, buf2, dt);
tick = cache_entry->start_time;
if (cache_entry->show_time && !magic_time(tick) && (buf1[0] != NULL)) {
if (cache_entry->show_time && !magic_time(tick) && (buf1[0] != '\0')) {
maxchars = gr_nchars(w->day_width - 5, buf1,c->fonts->boldfont);
buf1[min(cm_strlen(buf1), maxchars)]=NULL;
buf1[min(cm_strlen(buf1), maxchars)] = '\0';
gr_text(xc, x, y, c->fonts->boldfont, buf1, rect);
nlines++;
CalFontExtents(c->fonts->boldfont, &fontextents);
@@ -1117,7 +1117,7 @@ paint_entry(Calendar *c, int x, int y, int maxchars, Paint_cache *cache_entry, X
if (buf2[0] != '\0') {
maxchars = gr_nchars(w->day_width - 5, buf2,
c->fonts->viewfont);
buf2[min(cm_strlen(buf2), maxchars)]=NULL;
buf2[min(cm_strlen(buf2), maxchars)] = '\0';
gr_text(xc, x, y, c->fonts->viewfont, buf2, rect);
nlines++;
}
@@ -1391,7 +1391,7 @@ quick_button_cb(Widget widget, XtPointer client, XtPointer call)
{
Calendar *c = calendar;
Week *w = (Week *)c->view->week_info;
int dow = (int) client;
int dow = (int) (intptr_t) client;
char buf[BUFSIZ];
if (c->view->date != get_bot()) {

6
cde/programs/dtcm/dtcm/x_graphics.c
View File

@@ -2887,7 +2887,7 @@ x_print_multi_appts(void *gInfoP,
/* HH:MM xm - HH:MM xm format */
format_line2(appt, buf1, buf2, dt);
indented = (*buf1 != NULL);
indented = (*buf1 != '\0');
indentAmt = (view == dayGlance) ? 0 : 1;
if (indented)
indentAmt += 2;
@@ -2992,7 +2992,7 @@ x_print_list_range(Calendar *c, CSA_sint32 appt_type, int item_data,
"Appt List Beginning: %s"), buf2);
setup_range(&range_attrs, &ops, &i, start, end, appt_type,
NULL, B_FALSE, c->general->version);
0, B_FALSE, c->general->version);
stat = csa_list_entries(c->cal_handle, i, range_attrs,
ops, &a_total, &list, NULL);
if (stat != CSA_SUCCESS) {
@@ -3939,7 +3939,7 @@ x_print_month_appts(void *gInfoP, CSA_entry_handle *list,
{
get_time_str(appt, buf1);
indented = (*buf1 != NULL);
indented = (*buf1 != '\0');
lines = text_to_lines(appt->what->value->item.string_value, 1);
line_counter++;