go-unityscopes

Merge lp:~xavi-garcia-mena/go-unityscopes/pointers-init into lp:go-unityscopes/v1

  1. pointers-init
  2. Merge into v1
Proposed by Xavi Garcia
Status: Merged
Approved by: James Henstridge
Approved revision: 82
Merge reported by: Xavi Garcia
Merged at revision: not available
Proposed branch: lp:~xavi-garcia-mena/go-unityscopes/pointers-init
Merge into: lp:go-unityscopes/v1
Prerequisite: lp:~xavi-garcia-mena/go-unityscopes/cannedquery-new-methods
Diff against target: 153 lines (+13/-15)
7 files modified
activationresponse.go (+1/-1)
column_layout.go (+0/-2)
department.go (+1/-1)
metadata.go (+3/-3)
reply.go (+5/-5)
result.go (+2/-2)
unityscope.go (+1/-1)
To merge this branch: bzr merge lp:~xavi-garcia-mena/go-unityscopes/pointers-init
Reviewer Review Type Date Requested Status
James Henstridge Approve
Review via email: mp+253212@code.launchpad.net

Commit message

Removed some pointers initialization that are implicit and not needed.

Description of the change

Removed some pointers initialization that are implicit and not needed.

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Looks god

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'activationresponse.go'
2--- activationresponse.go 2015-03-17 14:36:12 +0000
3+++ activationresponse.go 2015-03-17 14:36:12 +0000
4@@ -62,7 +62,7 @@
5 if err != nil {
6 return err
7 }
8- var errorString *C.char = nil
9+ var errorString *C.char
10 C.activation_response_set_scope_data(responsePtr, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
11 if err = checkError(errorString); err != nil {
12 return err
13
14=== modified file 'column_layout.go'
15--- column_layout.go 2015-03-17 14:36:12 +0000
16+++ column_layout.go 2015-03-17 14:36:12 +0000
17@@ -44,8 +44,6 @@
18 var ptr_columns unsafe.Pointer
19 if len(widgetIds) > 0 {
20 ptr_columns = unsafe.Pointer(&widgetIds[0])
21- } else {
22- ptr_columns = nil
23 }
24 C.column_layout_add_column(layout.c, ptr_columns, C.int(len(widgetIds)), &errorString)
25
26
27=== modified file 'department.go'
28--- department.go 2015-03-17 14:36:12 +0000
29+++ department.go 2015-03-17 14:36:12 +0000
30@@ -23,7 +23,7 @@
31 // NewDepartment creates a new department using the given canned query.
32 func NewDepartment(departmentID string, query *CannedQuery, label string) (*Department, error) {
33 dept := makeDepartment()
34- var errorString *C.char = nil
35+ var errorString *C.char
36 C.new_department(unsafe.Pointer(&departmentID), query.q, unsafe.Pointer(&label), &dept.d[0], &errorString)
37
38 if err := checkError(errorString); err != nil {
39
40=== modified file 'metadata.go'
41--- metadata.go 2015-03-17 14:36:12 +0000
42+++ metadata.go 2015-03-17 14:36:12 +0000
43@@ -103,7 +103,7 @@
44 if err != nil {
45 return err
46 }
47- var errorString *C.char = nil
48+ var errorString *C.char
49 C.search_metadata_set_location(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
50 return checkError(errorString)
51 }
52@@ -166,7 +166,7 @@
53 if err != nil {
54 return err
55 }
56- var errorString *C.char = nil
57+ var errorString *C.char
58 C.action_metadata_set_scope_data(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
59 return checkError(errorString)
60 }
61@@ -177,7 +177,7 @@
62 if err != nil {
63 return err
64 }
65- var errorString *C.char = nil
66+ var errorString *C.char
67 C.action_metadata_set_hint(metadata.m, unsafe.Pointer(&key), (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
68 return checkError(errorString)
69 }
70
71=== modified file 'reply.go'
72--- reply.go 2015-03-17 14:36:12 +0000
73+++ reply.go 2015-03-17 14:36:12 +0000
74@@ -72,7 +72,7 @@
75
76 // Push sends a search result to the client.
77 func (reply *SearchReply) Push(result *CategorisedResult) error {
78- var errorString *C.char = nil
79+ var errorString *C.char
80 C.search_reply_push(&reply.r[0], result.result, &errorString)
81 return checkError(errorString)
82 }
83@@ -94,7 +94,7 @@
84 } else {
85 return err
86 }
87- var errorString *C.char = nil
88+ var errorString *C.char
89 C.search_reply_push_filters(&reply.r[0], unsafe.Pointer(&filtersJson), unsafe.Pointer(&stateJson), &errorString)
90 return checkError(errorString)
91 }
92@@ -144,7 +144,7 @@
93 }
94 widget_data[i] = string(data)
95 }
96- var errorString *C.char = nil
97+ var errorString *C.char
98 C.preview_reply_push_widgets(&reply.r[0], unsafe.Pointer(&widget_data[0]), C.int(len(widget_data)), &errorString)
99 return checkError(errorString)
100 }
101@@ -161,7 +161,7 @@
102 return err
103 }
104 json_value := string(data)
105- var errorString *C.char = nil
106+ var errorString *C.char
107 C.preview_reply_push_attr(&reply.r[0], unsafe.Pointer(&attr), unsafe.Pointer(&json_value), &errorString)
108 return checkError(errorString)
109 }
110@@ -176,7 +176,7 @@
111 for i, l := range layout {
112 api_layout[i] = l.c
113 }
114- var errorString *C.char = nil
115+ var errorString *C.char
116 C.preview_reply_register_layout(&reply.r[0], &api_layout[0], C.int(len(api_layout)), &errorString)
117 return checkError(errorString)
118 }
119
120=== modified file 'result.go'
121--- result.go 2015-03-17 14:36:12 +0000
122+++ result.go 2015-03-17 14:36:12 +0000
123@@ -37,7 +37,7 @@
124 func (res *Result) Get(attr string, value interface{}) error {
125 var (
126 length C.int
127- errorString *C.char = nil
128+ errorString *C.char
129 )
130 data := C.result_get_attr(res.result, unsafe.Pointer(&attr), &length, &errorString)
131 if err := checkError(errorString); err != nil {
132@@ -58,7 +58,7 @@
133 }
134 stringValue := string(data)
135
136- var errorString *C.char = nil
137+ var errorString *C.char
138 C.result_set_attr(res.result, unsafe.Pointer(&attr), unsafe.Pointer(&stringValue), &errorString)
139 return checkError(errorString)
140 }
141
142=== modified file 'unityscope.go'
143--- unityscope.go 2015-03-17 14:36:12 +0000
144+++ unityscope.go 2015-03-17 14:36:12 +0000
145@@ -192,7 +192,7 @@
146 }
147 scopeId := base[:len(base)-len(".ini")]
148
149- var errorString *C.char = nil
150+ var errorString *C.char
151 C.run_scope(unsafe.Pointer(&scopeId), unsafe.Pointer(runtimeConfig), unsafe.Pointer(scopeConfig), unsafe.Pointer(&scope), &errorString)
152 return checkError(errorString)
153 }

Subscribers

People subscribed via source and target branches

to all changes: