Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: runtime/bin/stdio.cc

Issue 1665993002: Prefer Dart_SetReturnValue over Dart_PropagateError when it makes sense. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « runtime/bin/socket.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "bin/builtin.h" 5 #include "bin/builtin.h"
6 #include "bin/dartutils.h" 6 #include "bin/dartutils.h"
7 #include "bin/utils.h" 7 #include "bin/utils.h"
8 #include "bin/stdio.h" 8 #include "bin/stdio.h"
9 9
10 #include "platform/globals.h" 10 #include "platform/globals.h"
(...skipping 29 matching lines...) Expand all
40 40
41 void FUNCTION_NAME(Stdin_SetLineMode)(Dart_NativeArguments args) { 41 void FUNCTION_NAME(Stdin_SetLineMode)(Dart_NativeArguments args) {
42 bool enabled = DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 0)); 42 bool enabled = DartUtils::GetBooleanValue(Dart_GetNativeArgument(args, 0));
43 Stdin::SetLineMode(enabled); 43 Stdin::SetLineMode(enabled);
44 } 44 }
45 45
46 46
47 void FUNCTION_NAME(Stdout_GetTerminalSize)(Dart_NativeArguments args) { 47 void FUNCTION_NAME(Stdout_GetTerminalSize)(Dart_NativeArguments args) {
48 if (!Dart_IsInteger(Dart_GetNativeArgument(args, 0))) { 48 if (!Dart_IsInteger(Dart_GetNativeArgument(args, 0))) {
49 OSError os_error(-1, "Invalid argument", OSError::kUnknown); 49 OSError os_error(-1, "Invalid argument", OSError::kUnknown);
50 Dart_Handle err = DartUtils::NewDartOSError(&os_error); 50 Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
51 if (Dart_IsError(err)) Dart_PropagateError(err);
52 Dart_SetReturnValue(args, err);
53 return; 51 return;
54 } 52 }
55 intptr_t fd = DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 0)); 53 intptr_t fd = DartUtils::GetIntptrValue(Dart_GetNativeArgument(args, 0));
56 if (fd != 1 && fd != 2) { 54 if (fd != 1 && fd != 2) {
57 Dart_PropagateError(Dart_NewApiError("Terminal fd must be 1 or 2")); 55 Dart_SetReturnValue(args, Dart_NewApiError("Terminal fd must be 1 or 2"));
56 return;
58 } 57 }
59 58
60 int size[2]; 59 int size[2];
61 if (Stdout::GetTerminalSize(fd, size)) { 60 if (Stdout::GetTerminalSize(fd, size)) {
62 Dart_Handle list = Dart_NewList(2); 61 Dart_Handle list = Dart_NewList(2);
63 Dart_ListSetAt(list, 0, Dart_NewInteger(size[0])); 62 Dart_ListSetAt(list, 0, Dart_NewInteger(size[0]));
64 Dart_ListSetAt(list, 1, Dart_NewInteger(size[1])); 63 Dart_ListSetAt(list, 1, Dart_NewInteger(size[1]));
65 Dart_SetReturnValue(args, list); 64 Dart_SetReturnValue(args, list);
66 } else { 65 } else {
67 Dart_SetReturnValue(args, DartUtils::NewDartOSError()); 66 Dart_SetReturnValue(args, DartUtils::NewDartOSError());
68 } 67 }
69 } 68 }
70 69
71 } // namespace bin 70 } // namespace bin
72 } // namespace dart 71 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/bin/socket.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698