Skip to content

Commit 58653e7

Browse files
Return void from log methods
1 parent 903d3b8 commit 58653e7

File tree

3 files changed

+13
-20
lines changed
  • android/sdl_android/src/main/java/com/smartdevicelink/util
  • base/src/main/java/com/smartdevicelink/util
  • javaSE/src/main/java/com/smartdevicelink/util

3 files changed

+13
-20
lines changed
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package com.smartdevicelink.util;
22

33
public class Log {
4-
public static int i(String tag, String message) {
5-
return android.util.Log.i(tag, message);
4+
public static void i(String tag, String message) {
5+
android.util.Log.i(tag, message);
66
}
77

8-
public static int w(String tag, String message) {
9-
return android.util.Log.w(tag, message);
8+
public static void w(String tag, String message) {
9+
android.util.Log.w(tag, message);
1010
}
1111

12-
public static int e(String tag, String message, Throwable t) {
12+
public static void e(String tag, String message, Throwable t) {
1313
if (t != null) {
14-
return android.util.Log.e(tag, message, t);
14+
android.util.Log.e(tag, message, t);
1515
} else {
16-
return android.util.Log.e(tag, message);
16+
android.util.Log.e(tag, message);
1717
}
1818
}
1919
}

base/src/main/java/com/smartdevicelink/util/NativeLogTool.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ private static boolean log(LogTarget ltarg, String source, String logMsg) {
109109
return false;
110110
}
111111

112-
int bytesWritten = 0;
113112
int substrSize = 0;
114113
String chunk = null;
115114
try {
@@ -118,18 +117,15 @@ private static boolean log(LogTarget ltarg, String source, String logMsg) {
118117
chunk = logMsg.substring(idx, idx + substrSize);
119118
switch (ltarg) {
120119
case Info:
121-
bytesWritten = Log.i(source, chunk);
120+
Log.i(source, chunk);
122121
break;
123122
case Warning:
124-
bytesWritten = Log.w(source, chunk);
123+
Log.w(source, chunk);
125124
break;
126125
case Error:
127-
bytesWritten = Log.e(source, chunk, null);
126+
Log.e(source, chunk, null);
128127
break;
129128
}
130-
if (bytesWritten < chunk.length()) {
131-
Log.w(TAG, "Calling Log.w: msg length=" + chunk.length() + ", bytesWritten=" + bytesWritten);
132-
}
133129
}
134130
} catch (Exception ex) {
135131
Log.e(TAG, "Failure writing " + ltarg.name() + " fragments to android log:" + ex.toString(), null);
Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,19 @@
11
package com.smartdevicelink.util;
22

33
public class Log {
4-
public static int i(String tag, String message) {
4+
public static void i(String tag, String message) {
55
System.out.print("\r\nINFO: " + tag + " - " + message);
6-
return 4000;
76
}
87

9-
public static int w(String tag, String message) {
8+
public static void w(String tag, String message) {
109
System.out.print("\r\nWARN: " + tag + " - " + message);
11-
return 4000;
1210
}
1311

14-
public static int e(String tag, String message, Throwable t) {
12+
public static void e(String tag, String message, Throwable t) {
1513
if (t != null) {
1614
System.out.print("\r\nERROR: " + tag + " - " + message + " - " + t.getMessage());
1715
} else {
1816
System.out.print("\r\nERROR: " + tag + " - " + message);
1917
}
20-
return 4000;
2118
}
2219
}

0 commit comments

Comments
 (0)