Changeset c1694b6b in mainline for uspace/app
- Timestamp:
- 2017-12-08T21:03:35Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- f77c1c9
- Parents:
- 9eb1ff5
- git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-07 18:20:13)
- git-committer:
- Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-08 21:03:35)
- Location:
- uspace/app
- Files:
-
- 18 edited
-
bnchmark/bnchmark.c (modified) (2 diffs)
-
devctl/devctl.c (modified) (4 diffs)
-
fontviewer/fontviewer.c (modified) (3 diffs)
-
inet/inet.c (modified) (8 diffs)
-
mkbd/main.c (modified) (2 diffs)
-
modplay/modplay.c (modified) (2 diffs)
-
nterm/conn.c (modified) (1 diff)
-
ping/ping.c (modified) (2 diffs)
-
rcutest/rcutest.c (modified) (2 diffs)
-
sysinst/sysinst.c (modified) (3 diffs)
-
taskdump/taskdump.c (modified) (6 diffs)
-
tester/chardev/chardev1.c (modified) (3 diffs)
-
tester/mm/mapping1.c (modified) (2 diffs)
-
tester/vfs/vfs1.c (modified) (2 diffs)
-
trace/ipcp.c (modified) (2 diffs)
-
trace/trace.c (modified) (5 diffs)
-
websrv/websrv.c (modified) (1 diff)
-
wifi_supplicant/wifi_supplicant.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/bnchmark/bnchmark.c
r9eb1ff5 rc1694b6b 41 41 #include <stdlib.h> 42 42 #include <stdint.h> 43 #include <str_error.h> 43 44 #include <mem.h> 44 45 #include <loc.h> … … 186 187 rc = measure(fn, path, &milliseconds_taken); 187 188 if (rc != EOK) { 188 fprintf(stderr, "Error %d\n", rc);189 fprintf(stderr, "Error: %s\n", str_error(rc)); 189 190 return 1; 190 191 } -
uspace/app/devctl/devctl.c
r9eb1ff5 rc1694b6b 324 324 rc = devman_driver_get_handle(drvname, &drvh); 325 325 if (rc != EOK) { 326 printf("Failed resolving driver '%s' (%d).\n", drvname, rc);326 printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc)); 327 327 return rc; 328 328 } … … 330 330 rc = devman_driver_load(drvh); 331 331 if (rc != EOK) { 332 printf("Failed loading driver '%s' (%d).\n", drvname, rc);332 printf("Failed loading driver '%s': %s.\n", drvname, str_error(rc)); 333 333 return rc; 334 334 } … … 344 344 rc = devman_driver_get_handle(drvname, &drvh); 345 345 if (rc != EOK) { 346 printf("Failed resolving driver '%s' (%d).\n", drvname, rc);346 printf("Failed resolving driver '%s': %s.\n", drvname, str_error(rc)); 347 347 return rc; 348 348 } … … 350 350 rc = devman_driver_unload(drvh); 351 351 if (rc != EOK) { 352 printf("Failed unloading driver '%s' (%d).\n", drvname, rc);352 printf("Failed unloading driver '%s': %s.\n", drvname, str_error(rc)); 353 353 return rc; 354 354 } -
uspace/app/fontviewer/fontviewer.c
r9eb1ff5 rc1694b6b 38 38 #include <stdlib.h> 39 39 #include <stdbool.h> 40 #include <str_error.h> 40 41 #include <window.h> 41 42 #include <canvas.h> … … 97 98 int rc = draw(); 98 99 if (rc != EOK) { 99 printf("Failed drawing: % d.\n", rc);100 printf("Failed drawing: %s.\n", str_error(rc)); 100 101 exit(1); 101 102 } … … 276 277 int rc = draw(); 277 278 if (rc != EOK) { 278 printf("Failed drawing: % d.\n", rc);279 printf("Failed drawing: %s.\n", str_error(rc)); 279 280 return 2; 280 281 } -
uspace/app/inet/inet.c
r9eb1ff5 rc1694b6b 89 89 rc = loc_service_get_id(link_name, &link_id, 0); 90 90 if (rc != EOK) { 91 printf(NAME ": Service '%s' not found (%d).\n", link_name, rc);91 printf(NAME ": Service '%s' not found: %s.\n", link_name, str_error(rc)); 92 92 return ENOENT; 93 93 } … … 135 135 rc = loc_service_get_id(link_name, &link_id, 0); 136 136 if (rc != EOK) { 137 printf(NAME ": Service '%s' not found (%d).\n", link_name, rc); 137 printf(NAME ": Service '%s' not found: %s.\n", link_name, 138 str_error(rc)); 138 139 return ENOENT; 139 140 } … … 141 142 rc = inetcfg_addr_get_id(aobj_name, link_id, &addr_id); 142 143 if (rc != EOK) { 143 printf(NAME ": Address '%s' not found (%d).\n", aobj_name, rc); 144 printf(NAME ": Address '%s' not found: %s.\n", aobj_name, 145 str_error(rc)); 144 146 return ENOENT; 145 147 } … … 147 149 rc = inetcfg_addr_delete(addr_id); 148 150 if (rc != EOK) { 149 printf(NAME ": Failed deleting address '%s' (%d)\n", aobj_name,150 rc);151 printf(NAME ": Failed deleting address '%s': %s\n", aobj_name, 152 str_error(rc)); 151 153 return EIO; 152 154 } … … 197 199 rc = inetcfg_sroute_create(route_name, &dest, &router, &sroute_id); 198 200 if (rc != EOK) { 199 printf(NAME ": Failed creating static route '%s' (%d)\n",200 route_name, rc);201 printf(NAME ": Failed creating static route '%s': %s\n", 202 route_name, str_error(rc)); 201 203 return EIO; 202 204 } … … 227 229 rc = inetcfg_sroute_get_id(route_name, &sroute_id); 228 230 if (rc != EOK) { 229 printf(NAME ": Static route '%s' not found (%d).\n",230 route_name, rc);231 printf(NAME ": Static route '%s' not found: %s.\n", 232 route_name, str_error(rc)); 231 233 return ENOENT; 232 234 } … … 234 236 rc = inetcfg_sroute_delete(sroute_id); 235 237 if (rc != EOK) { 236 printf(NAME ": Failed deleting static route '%s' (%d)\n",237 route_name, rc);238 printf(NAME ": Failed deleting static route '%s': %s\n", 239 route_name, str_error(rc)); 238 240 return EIO; 239 241 } … … 486 488 rc = inetcfg_init(); 487 489 if (rc != EOK) { 488 printf(NAME ": Failed connecting to internet service (%d).\n",489 rc);490 printf(NAME ": Failed connecting to internet service: %s.\n", 491 str_error(rc)); 490 492 return 1; 491 493 } -
uspace/app/mkbd/main.c
r9eb1ff5 rc1694b6b 237 237 rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH); 238 238 if (rc != EOK) { 239 printf(NAME ": failed to get path (handle %" 240 PRIun "): %s.\n", dev_handle, str_error(errno)); 239 241 return ENOMEM; 240 242 } … … 262 264 uint8_t *event = (uint8_t *)malloc(size); 263 265 if (event == NULL) { 266 printf("Out of memory.\n"); 264 267 // TODO: hangup phone? 265 268 return ENOMEM; -
uspace/app/modplay/modplay.c
r9eb1ff5 rc1694b6b 40 40 #include <stdio.h> 41 41 #include <stdlib.h> 42 #include <str_error.h> 42 43 #include <trackmod.h> 43 44 … … 117 118 rc = hound_context_connect_target(hound, HOUND_DEFAULT_TARGET); 118 119 if (rc != EOK) { 119 printf("Error connecting default audio target (%d).\n", rc);120 printf("Error connecting default audio target: %s.\n", str_error(rc)); 120 121 return 1; 121 122 } -
uspace/app/nterm/conn.c
r9eb1ff5 rc1694b6b 75 75 rc = tcp_conn_recv(conn, recv_buf, RECV_BUF_SIZE, &nrecv); 76 76 if (rc != EOK) { 77 printf("\n[Receive error %d]\n", rc);77 printf("\n[Receive error: %s]\n", str_error_name(rc)); 78 78 break; 79 79 } -
uspace/app/ping/ping.c
r9eb1ff5 rc1694b6b 145 145 int rc = inetping_send(&sdu); 146 146 if (rc != EOK) 147 printf("Failed sending echo request: %s (%d).\n",148 str_error (rc), rc);147 printf("Failed sending echo request: %s: %s.\n", 148 str_error_name(rc), str_error(rc)); 149 149 150 150 return rc; … … 225 225 if (rc != EOK) { 226 226 printf("Failed connecting to internet ping service: " 227 "%s (%d).\n", str_error(rc), rc);227 "%s: %s.\n", str_error_name(rc), str_error(rc)); 228 228 goto error; 229 229 } -
uspace/app/rcutest/rcutest.c
r9eb1ff5 rc1694b6b 38 38 #include <stdlib.h> 39 39 #include <stdint.h> 40 #include <str_error.h> 40 41 #include <mem.h> 41 42 #include <errno.h> … … 780 781 int ret = thread_create(dummy_fibril, NULL, "urcu-test-worker", &tid); 781 782 if (EOK != ret) { 782 printf("Failed to create thread '%zu' (error: % d)\n", k + 1, ret);783 printf("Failed to create thread '%zu' (error: %s)\n", k + 1, str_error_name(ret)); 783 784 return false; 784 785 } -
uspace/app/sysinst/sysinst.c
r9eb1ff5 rc1694b6b 44 44 #include <stdio.h> 45 45 #include <stdlib.h> 46 #include <str_error.h> 46 47 #include <task.h> 47 48 #include <vfs/vfs.h> … … 117 118 rc = fdisk_label_create(fdev, lt_mbr); 118 119 if (rc != EOK) { 119 printf("Error creating label (%d).\n", rc);120 printf("Error creating label: %s.\n", str_error(rc)); 120 121 return rc; 121 122 } … … 125 126 rc = fdisk_part_get_max_avail(fdev, spc_pri, &cap); 126 127 if (rc != EOK) { 127 printf("Error getting available capacity (%d).\n", rc);128 printf("Error getting available capacity: %s.\n", str_error(rc)); 128 129 return rc; 129 130 } -
uspace/app/taskdump/taskdump.c
r9eb1ff5 rc1694b6b 142 142 int rc = udebug_begin(ksess); 143 143 if (rc < 0) { 144 printf("udebug_begin() -> % d\n", rc);144 printf("udebug_begin() -> %s\n", str_error_name(rc)); 145 145 return rc; 146 146 } … … 224 224 rc = udebug_thread_read(sess, &dummy_buf, 0, &copied, &needed); 225 225 if (rc < 0) { 226 printf("udebug_thread_read() -> % d\n", rc);226 printf("udebug_thread_read() -> %s\n", str_error_name(rc)); 227 227 return rc; 228 228 } … … 238 238 rc = udebug_thread_read(sess, thash_buf, buf_size, &copied, &needed); 239 239 if (rc < 0) { 240 printf("udebug_thread_read() -> % d\n", rc);240 printf("udebug_thread_read() -> %s\n", str_error_name(rc)); 241 241 return rc; 242 242 } … … 273 273 rc = udebug_areas_read(sess, &dummy_buf, 0, &copied, &needed); 274 274 if (rc < 0) { 275 printf("udebug_areas_read() -> % d\n", rc);275 printf("udebug_areas_read() -> %s\n", str_error_name(rc)); 276 276 return rc; 277 277 } … … 282 282 rc = udebug_areas_read(sess, ainfo_buf, buf_size, &copied, &needed); 283 283 if (rc < 0) { 284 printf("udebug_areas_read() -> % d\n", rc);284 printf("udebug_areas_read() -> %s\n", str_error_name(rc)); 285 285 return rc; 286 286 } … … 358 358 rc = udebug_regs_read(sess, thash, &istate); 359 359 if (rc < 0) { 360 printf("Failed reading registers (%d).\n", rc);360 printf("Failed reading registers: %s.\n", str_error_name(rc)); 361 361 return EIO; 362 362 } -
uspace/app/tester/chardev/chardev1.c
r9eb1ff5 rc1694b6b 28 28 29 29 #include <errno.h> 30 #include <str_error.h> 30 31 #include <ipc/services.h> 31 32 #include <io/chardev.h> … … 177 178 } 178 179 179 TPRINTF("Sent %zu bytes and got rc = %d (expected)\n", nbytes, rc); 180 TPRINTF("Sent %zu bytes and got rc = %s (expected)\n", nbytes, 181 str_error_name(rc)); 180 182 181 183 rc = chardev_read(chardev, small_buffer, SMALL_BUFFER_SIZE, &nbytes); … … 186 188 } 187 189 188 TPRINTF("Received %zu bytes and got rc = %d (expected)\n", nbytes, rc); 190 TPRINTF("Received %zu bytes and got rc = %s (expected)\n", nbytes, 191 str_error_name(rc)); 189 192 190 193 chardev_close(chardev); -
uspace/app/tester/mm/mapping1.c
r9eb1ff5 rc1694b6b 30 30 #include <stdlib.h> 31 31 #include <stddef.h> 32 #include <str_error.h> 32 33 #include <as.h> 33 34 #include <errno.h> … … 74 75 int rc = as_get_physical_mapping(page_start, NULL); 75 76 if (rc != expected_rc) { 76 TPRINTF("as_get_physical_mapping() = % d != %d\n",77 rc, expected_rc);77 TPRINTF("as_get_physical_mapping() = %s != %s\n", 78 str_error_name(rc), str_error_name(expected_rc)); 78 79 return false; 79 80 } -
uspace/app/tester/vfs/vfs1.c
r9eb1ff5 rc1694b6b 31 31 #include <stdlib.h> 32 32 #include <stddef.h> 33 #include <str_error.h> 33 34 #include <str.h> 34 35 #include <vfs/vfs.h> … … 95 96 TPRINTF("read..\n"); 96 97 while ((rc = vfs_read(fd0, &pos, buf, BUF_SIZE, &cnt))) { 97 TPRINTF("read returns rc = % d, cnt = %zu\n", rc, cnt);98 TPRINTF("read returns rc = %s, cnt = %zu\n", str_error_name(rc), cnt); 98 99 if (rc != EOK) 99 100 return "read() failed"; -
uspace/app/trace/ipcp.c
r9eb1ff5 rc1694b6b 35 35 #include <stdio.h> 36 36 #include <stdlib.h> 37 #include <str_error.h> 37 38 #include <inttypes.h> 38 39 #include <adt/hash_table.h> … … 347 348 { 348 349 if ((display_mask & DM_SYSTEM) != 0) { 349 printf("Hang phone %d up -> % d\n", phone, rc);350 printf("Hang phone %d up -> %s\n", phone, str_error_name(rc)); 350 351 ipcp_connection_clear(phone); 351 352 } -
uspace/app/trace/trace.c
r9eb1ff5 rc1694b6b 164 164 int rc = udebug_begin(ksess); 165 165 if (rc < 0) { 166 printf("udebug_begin() -> % d\n", rc);166 printf("udebug_begin() -> %s\n", str_error_name(rc)); 167 167 return rc; 168 168 } … … 170 170 rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL); 171 171 if (rc < 0) { 172 printf("udebug_set_evmask(0x%x) -> % d\n ", UDEBUG_EM_ALL, rc);172 printf("udebug_set_evmask(0x%x) -> %s\n ", UDEBUG_EM_ALL, str_error_name(rc)); 173 173 return rc; 174 174 } … … 188 188 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed); 189 189 if (rc < 0) { 190 printf("udebug_thread_read() -> % d\n", rc);190 printf("udebug_thread_read() -> %s\n", str_error_name(rc)); 191 191 return rc; 192 192 } … … 605 605 rc = get_thread_list(); 606 606 if (rc < 0) { 607 printf("Failed to get thread list ( error %d)\n", rc);607 printf("Failed to get thread list (%s)\n", str_error(rc)); 608 608 return; 609 609 } … … 644 644 rc = udebug_stop(sess, thash); 645 645 if (rc != EOK) 646 printf("Error: stop -> % d\n", rc);646 printf("Error: stop -> %s\n", str_error_name(rc)); 647 647 break; 648 648 case KC_R: -
uspace/app/websrv/websrv.c
r9eb1ff5 rc1694b6b 168 168 rc = tcp_conn_recv_wait(recv->conn, recv->rbuf, BUFFER_SIZE, &nrecv); 169 169 if (rc != EOK) { 170 fprintf(stderr, "tcp_conn_recv() failed (%d)\n", rc);170 fprintf(stderr, "tcp_conn_recv() failed: %s\n", str_error(rc)); 171 171 return rc; 172 172 } -
uspace/app/wifi_supplicant/wifi_supplicant.c
r9eb1ff5 rc1694b6b 41 41 #include <stdio.h> 42 42 #include <stdlib.h> 43 #include <str_error.h> 43 44 #include <loc.h> 44 45 … … 139 140 int rc = get_wifi_list(&wifis, &count); 140 141 if (rc != EOK) { 141 printf("Error fetching wifi list .\n");142 printf("Error fetching wifi list: %s\n", str_error(rc)); 142 143 return EINVAL; 143 144 } … … 148 149 rc = loc_service_get_name(wifis[i], &svc_name); 149 150 if (rc != EOK) { 150 printf("Error getting service name .\n");151 printf("Error getting service name: %s\n", str_error(rc)); 151 152 free(wifis); 152 153 return rc; … … 177 178 printf("Device is not ready yet.\n"); 178 179 else 179 printf("Error when disconnecting device . "180 "Error: %d\n", rc);180 printf("Error when disconnecting device: %s\n", 181 str_error(rc)); 181 182 182 183 return rc; … … 192 193 printf("Given SSID not in scan results.\n"); 193 194 else 194 printf("Error when connecting to network . "195 "Error: %d\n", rc);195 printf("Error when connecting to network: %s\n", 196 str_error(rc)); 196 197 197 198 return rc; … … 221 222 printf("Not connected to any WiFi network.\n"); 222 223 else 223 printf("Error when disconnecting from network . "224 "Error: %d\n", rc);224 printf("Error when disconnecting from network: %s\n", 225 str_error(rc)); 225 226 226 227 return rc; … … 247 248 printf("Device is not ready yet.\n"); 248 249 else 249 printf("Failed to fetch scan results. Error: %d\n", rc); 250 printf("Failed to fetch scan results: %s\n", 251 str_error(rc)); 250 252 251 253 return rc; … … 277 279 int rc = inetcfg_init(); 278 280 if (rc != EOK) { 279 printf("%s: Failed connecting to inetcfg service (%d).\n",280 NAME, rc);281 printf("%s: Failed connecting to inetcfg service: %s.\n", 282 NAME, str_error(rc)); 281 283 return 1; 282 284 } … … 284 286 rc = dhcp_init(); 285 287 if (rc != EOK) { 286 printf("%s: Failed connecting to dhcp service (%d).\n",287 NAME, rc);288 printf("%s: Failed connecting to dhcp service: %s.\n", 289 NAME, str_error(rc)); 288 290 return 1; 289 291 }
Note:
See TracChangeset
for help on using the changeset viewer.
