fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

day_process_storage(): Remove redundant parameter

Browse Source 
Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2013-02-01 18:42:45 +01:00
parent 6e733b98d0
commit 9a6df45c4b
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calcurse.c
View File

@ -49,8 +49,8 @@ int count, reg;
*/ */
static struct day_items_nb do_storage(int day_changed) static struct day_items_nb do_storage(int day_changed)
{ {
struct day_items_nb inday = *day_process_storage(calendar_get_slctd_day(), struct day_items_nb inday = day_process_storage(calendar_get_slctd_day(),
day_changed, &inday); day_changed);
if (day_changed) { if (day_changed) {
if ((inday.nb_events + inday.nb_apoints) > 0) if ((inday.nb_events + inday.nb_apoints) > 0)
@ -578,7 +578,7 @@ int main(int argc, char **argv)
wins_update(FLAG_ALL); wins_update(FLAG_ALL);
io_startup_screen(no_data_file); io_startup_screen(no_data_file);
} }
inday = *day_process_storage(0, 0, &inday); inday = day_process_storage(0, 0);
wins_slctd_set(conf.default_panel); wins_slctd_set(conf.default_panel);
wins_update(FLAG_ALL); wins_update(FLAG_ALL);

3
src/calcurse.h
View File

@ -684,8 +684,7 @@ int day_item_get_state(struct day_item *);
void day_item_add_exc(struct day_item *, long); void day_item_add_exc(struct day_item *, long);
void day_item_fork(struct day_item *, struct day_item *); void day_item_fork(struct day_item *, struct day_item *);
int day_store_items(long, unsigned *, unsigned *, regex_t *); int day_store_items(long, unsigned *, unsigned *, regex_t *);
struct day_items_nb *day_process_storage(struct date *, unsigned, struct day_items_nb day_process_storage(struct date *, unsigned);
struct day_items_nb *);
void day_write_pad(long, int, int, int); void day_write_pad(long, int, int, int);
void day_write_stdout(long, const char *, const char *, const char *, void day_write_stdout(long, const char *, const char *, const char *,
const char *); const char *);

10
src/day.c
View File

@ -360,12 +360,12 @@ day_store_items(long date, unsigned *pnb_events, unsigned *pnb_apoints,
* those items in a pad. If selected day is null, then store items for current * those items in a pad. If selected day is null, then store items for current
* day. This is useful to speed up the appointment panel update. * day. This is useful to speed up the appointment panel update.
*/ */
struct day_items_nb *day_process_storage(struct date *slctd_date, struct day_items_nb day_process_storage(struct date *slctd_date,
unsigned day_changed, unsigned day_changed)
struct day_items_nb *inday)
{ {
long date; long date;
struct date day; struct date day;
struct day_items_nb inday;
if (slctd_date) if (slctd_date)
day = *slctd_date; day = *slctd_date;
@ -379,8 +379,8 @@ struct day_items_nb *day_process_storage(struct date *slctd_date,
delwin(apad.ptrwin); delwin(apad.ptrwin);
/* Store the events and appointments (recursive and normal items). */ /* Store the events and appointments (recursive and normal items). */
day_store_items(date, &inday->nb_events, &inday->nb_apoints, NULL); day_store_items(date, &inday.nb_events, &inday.nb_apoints, NULL);
apad.length = (inday->nb_events + 1 + 3 * inday->nb_apoints); apad.length = (inday.nb_events + 1 + 3 * inday.nb_apoints);
/* Create the new pad with its new length. */ /* Create the new pad with its new length. */
if (day_changed) if (day_changed)