Changeset b7fd2a0 in mainline for uspace/app/edit
- Timestamp:
- 2018-01-13T03:10:29Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a53ed3a
- Parents:
- 36f0738
- Location:
- uspace/app/edit
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/edit/edit.c
r36f0738 rb7fd2a0 132 132 static void pos_handle(pos_event_t *ev); 133 133 134 static int file_save(char const *fname);134 static errno_t file_save(char const *fname); 135 135 static void file_save_as(void); 136 static int file_insert(char *fname);137 static int file_save_range(char const *fname, spt_t const *spos,136 static errno_t file_insert(char *fname); 137 static errno_t file_save_range(char const *fname, spt_t const *spos, 138 138 spt_t const *epos); 139 139 static char *range_get_str(spt_t const *spos, spt_t const *epos); … … 191 191 cons_event_t ev; 192 192 bool new_file; 193 int rc;193 errno_t rc; 194 194 195 195 con = console_init(stdin, stdout); … … 578 578 579 579 /** Save the document. */ 580 static int file_save(char const *fname)580 static errno_t file_save(char const *fname) 581 581 { 582 582 spt_t sp, ep; 583 int rc;583 errno_t rc; 584 584 585 585 status_display("Saving..."); … … 616 616 } 617 617 618 int rc = file_save(fname);618 errno_t rc = file_save(fname); 619 619 if (rc != EOK) 620 620 return; … … 697 697 * of the caret. 698 698 */ 699 static int file_insert(char *fname)699 static errno_t file_insert(char *fname) 700 700 { 701 701 FILE *f; … … 735 735 736 736 /** Save a range of text into a file. */ 737 static int file_save_range(char const *fname, spt_t const *spos,737 static errno_t file_save_range(char const *fname, spt_t const *spos, 738 738 spt_t const *epos) 739 739 { … … 1283 1283 1284 1284 /* Search operations */ 1285 static int search_spt_producer(void *data, wchar_t *ret)1285 static errno_t search_spt_producer(void *data, wchar_t *ret) 1286 1286 { 1287 1287 assert(data != NULL); … … 1292 1292 } 1293 1293 1294 static int search_spt_reverse_producer(void *data, wchar_t *ret)1294 static errno_t search_spt_reverse_producer(void *data, wchar_t *ret) 1295 1295 { 1296 1296 assert(data != NULL); … … 1301 1301 } 1302 1302 1303 static int search_spt_mark(void *data, void **mark)1303 static errno_t search_spt_mark(void *data, void **mark) 1304 1304 { 1305 1305 assert(data != NULL); … … 1397 1397 1398 1398 match_t match; 1399 int rc = search_next_match(search, &match);1399 errno_t rc = search_next_match(search, &match); 1400 1400 if (rc != EOK) { 1401 1401 status_display("Failed searching."); … … 1515 1515 size_t off; 1516 1516 wchar_t c; 1517 int rc;1517 errno_t rc; 1518 1518 1519 1519 rc = clipboard_get_str(&str); -
uspace/app/edit/search.c
r36f0738 rb7fd2a0 105 105 } 106 106 107 int search_next_match(search_t *s, match_t *match)107 errno_t search_next_match(search_t *s, match_t *match) 108 108 { 109 109 search_equals_fn eq = s->ops.equals; 110 110 111 111 wchar_t cur_char; 112 int rc = EOK;112 errno_t rc = EOK; 113 113 while ((rc = s->ops.producer(s->client_data, &cur_char)) == EOK && cur_char > 0) { 114 114 /* Deal with mismatches */ -
uspace/app/edit/search.h
r36f0738 rb7fd2a0 43 43 typedef struct search search_t; 44 44 typedef bool (*search_equals_fn)(const wchar_t, const wchar_t); 45 typedef int (*search_producer_fn)(void *, wchar_t *);46 typedef int (*search_mark_fn)(void *, void **);45 typedef errno_t (*search_producer_fn)(void *, wchar_t *); 46 typedef errno_t (*search_mark_fn)(void *, void **); 47 47 typedef void (*search_mark_free_fn)(void *); 48 48 … … 61 61 extern bool char_exact_equals(const wchar_t, const wchar_t); 62 62 extern search_t *search_init(const char *, void *, search_ops_t, bool); 63 extern int search_next_match(search_t *, match_t *);63 extern errno_t search_next_match(search_t *, match_t *); 64 64 extern void search_fini(search_t *); 65 65 -
uspace/app/edit/sheet.c
r36f0738 rb7fd2a0 67 67 68 68 /** Initialize an empty sheet. */ 69 int sheet_create(sheet_t **rsh)69 errno_t sheet_create(sheet_t **rsh) 70 70 { 71 71 sheet_t *sh; … … 101 101 * and vice versa. 102 102 */ 103 int sheet_insert(sheet_t *sh, spt_t *pos, enum dir_spec dir, char *str)103 errno_t sheet_insert(sheet_t *sh, spt_t *pos, enum dir_spec dir, char *str) 104 104 { 105 105 char *ipp; … … 147 147 * @return EOK on success or an error code. 148 148 **/ 149 int sheet_delete(sheet_t *sh, spt_t *spos, spt_t *epos)149 errno_t sheet_delete(sheet_t *sh, spt_t *spos, spt_t *epos) 150 150 { 151 151 char *spp; -
uspace/app/edit/sheet.h
r36f0738 rb7fd2a0 90 90 } tag_t; 91 91 92 extern int sheet_create(sheet_t **);93 extern int sheet_insert(sheet_t *, spt_t *, enum dir_spec, char *);94 extern int sheet_delete(sheet_t *, spt_t *, spt_t *);92 extern errno_t sheet_create(sheet_t **); 93 extern errno_t sheet_insert(sheet_t *, spt_t *, enum dir_spec, char *); 94 extern errno_t sheet_delete(sheet_t *, spt_t *, spt_t *); 95 95 extern void sheet_copy_out(sheet_t *, spt_t const *, spt_t const *, char *, 96 96 size_t, spt_t *);
Note:
See TracChangeset
for help on using the changeset viewer.