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
=== modified file 'activationresponse.go'
--- activationresponse.go 2015-03-17 14:36:12 +0000
+++ activationresponse.go 2015-03-17 14:36:12 +0000
@@ -62,7 +62,7 @@
62 if err != nil {62 if err != nil {
63 return err63 return err
64 }64 }
65 var errorString *C.char = nil65 var errorString *C.char
66 C.activation_response_set_scope_data(responsePtr, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)66 C.activation_response_set_scope_data(responsePtr, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
67 if err = checkError(errorString); err != nil {67 if err = checkError(errorString); err != nil {
68 return err68 return err
6969
=== modified file 'column_layout.go'
--- column_layout.go 2015-03-17 14:36:12 +0000
+++ column_layout.go 2015-03-17 14:36:12 +0000
@@ -44,8 +44,6 @@
44 var ptr_columns unsafe.Pointer44 var ptr_columns unsafe.Pointer
45 if len(widgetIds) > 0 {45 if len(widgetIds) > 0 {
46 ptr_columns = unsafe.Pointer(&widgetIds[0])46 ptr_columns = unsafe.Pointer(&widgetIds[0])
47 } else {
48 ptr_columns = nil
49 }47 }
50 C.column_layout_add_column(layout.c, ptr_columns, C.int(len(widgetIds)), &errorString)48 C.column_layout_add_column(layout.c, ptr_columns, C.int(len(widgetIds)), &errorString)
5149
5250
=== modified file 'department.go'
--- department.go 2015-03-17 14:36:12 +0000
+++ department.go 2015-03-17 14:36:12 +0000
@@ -23,7 +23,7 @@
23// NewDepartment creates a new department using the given canned query.23// NewDepartment creates a new department using the given canned query.
24func NewDepartment(departmentID string, query *CannedQuery, label string) (*Department, error) {24func NewDepartment(departmentID string, query *CannedQuery, label string) (*Department, error) {
25 dept := makeDepartment()25 dept := makeDepartment()
26 var errorString *C.char = nil26 var errorString *C.char
27 C.new_department(unsafe.Pointer(&departmentID), query.q, unsafe.Pointer(&label), &dept.d[0], &errorString)27 C.new_department(unsafe.Pointer(&departmentID), query.q, unsafe.Pointer(&label), &dept.d[0], &errorString)
2828
29 if err := checkError(errorString); err != nil {29 if err := checkError(errorString); err != nil {
3030
=== modified file 'metadata.go'
--- metadata.go 2015-03-17 14:36:12 +0000
+++ metadata.go 2015-03-17 14:36:12 +0000
@@ -103,7 +103,7 @@
103 if err != nil {103 if err != nil {
104 return err104 return err
105 }105 }
106 var errorString *C.char = nil106 var errorString *C.char
107 C.search_metadata_set_location(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)107 C.search_metadata_set_location(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
108 return checkError(errorString)108 return checkError(errorString)
109}109}
@@ -166,7 +166,7 @@
166 if err != nil {166 if err != nil {
167 return err167 return err
168 }168 }
169 var errorString *C.char = nil169 var errorString *C.char
170 C.action_metadata_set_scope_data(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)170 C.action_metadata_set_scope_data(metadata.m, (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
171 return checkError(errorString)171 return checkError(errorString)
172}172}
@@ -177,7 +177,7 @@
177 if err != nil {177 if err != nil {
178 return err178 return err
179 }179 }
180 var errorString *C.char = nil180 var errorString *C.char
181 C.action_metadata_set_hint(metadata.m, unsafe.Pointer(&key), (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)181 C.action_metadata_set_hint(metadata.m, unsafe.Pointer(&key), (*C.char)(unsafe.Pointer(&data[0])), C.int(len(data)), &errorString)
182 return checkError(errorString)182 return checkError(errorString)
183}183}
184184
=== modified file 'reply.go'
--- reply.go 2015-03-17 14:36:12 +0000
+++ reply.go 2015-03-17 14:36:12 +0000
@@ -72,7 +72,7 @@
7272
73// Push sends a search result to the client.73// Push sends a search result to the client.
74func (reply *SearchReply) Push(result *CategorisedResult) error {74func (reply *SearchReply) Push(result *CategorisedResult) error {
75 var errorString *C.char = nil75 var errorString *C.char
76 C.search_reply_push(&reply.r[0], result.result, &errorString)76 C.search_reply_push(&reply.r[0], result.result, &errorString)
77 return checkError(errorString)77 return checkError(errorString)
78}78}
@@ -94,7 +94,7 @@
94 } else {94 } else {
95 return err95 return err
96 }96 }
97 var errorString *C.char = nil97 var errorString *C.char
98 C.search_reply_push_filters(&reply.r[0], unsafe.Pointer(&filtersJson), unsafe.Pointer(&stateJson), &errorString)98 C.search_reply_push_filters(&reply.r[0], unsafe.Pointer(&filtersJson), unsafe.Pointer(&stateJson), &errorString)
99 return checkError(errorString)99 return checkError(errorString)
100}100}
@@ -144,7 +144,7 @@
144 }144 }
145 widget_data[i] = string(data)145 widget_data[i] = string(data)
146 }146 }
147 var errorString *C.char = nil147 var errorString *C.char
148 C.preview_reply_push_widgets(&reply.r[0], unsafe.Pointer(&widget_data[0]), C.int(len(widget_data)), &errorString)148 C.preview_reply_push_widgets(&reply.r[0], unsafe.Pointer(&widget_data[0]), C.int(len(widget_data)), &errorString)
149 return checkError(errorString)149 return checkError(errorString)
150}150}
@@ -161,7 +161,7 @@
161 return err161 return err
162 }162 }
163 json_value := string(data)163 json_value := string(data)
164 var errorString *C.char = nil164 var errorString *C.char
165 C.preview_reply_push_attr(&reply.r[0], unsafe.Pointer(&attr), unsafe.Pointer(&json_value), &errorString)165 C.preview_reply_push_attr(&reply.r[0], unsafe.Pointer(&attr), unsafe.Pointer(&json_value), &errorString)
166 return checkError(errorString)166 return checkError(errorString)
167}167}
@@ -176,7 +176,7 @@
176 for i, l := range layout {176 for i, l := range layout {
177 api_layout[i] = l.c177 api_layout[i] = l.c
178 }178 }
179 var errorString *C.char = nil179 var errorString *C.char
180 C.preview_reply_register_layout(&reply.r[0], &api_layout[0], C.int(len(api_layout)), &errorString)180 C.preview_reply_register_layout(&reply.r[0], &api_layout[0], C.int(len(api_layout)), &errorString)
181 return checkError(errorString)181 return checkError(errorString)
182}182}
183183
=== modified file 'result.go'
--- result.go 2015-03-17 14:36:12 +0000
+++ result.go 2015-03-17 14:36:12 +0000
@@ -37,7 +37,7 @@
37func (res *Result) Get(attr string, value interface{}) error {37func (res *Result) Get(attr string, value interface{}) error {
38 var (38 var (
39 length C.int39 length C.int
40 errorString *C.char = nil40 errorString *C.char
41 )41 )
42 data := C.result_get_attr(res.result, unsafe.Pointer(&attr), &length, &errorString)42 data := C.result_get_attr(res.result, unsafe.Pointer(&attr), &length, &errorString)
43 if err := checkError(errorString); err != nil {43 if err := checkError(errorString); err != nil {
@@ -58,7 +58,7 @@
58 }58 }
59 stringValue := string(data)59 stringValue := string(data)
6060
61 var errorString *C.char = nil61 var errorString *C.char
62 C.result_set_attr(res.result, unsafe.Pointer(&attr), unsafe.Pointer(&stringValue), &errorString)62 C.result_set_attr(res.result, unsafe.Pointer(&attr), unsafe.Pointer(&stringValue), &errorString)
63 return checkError(errorString)63 return checkError(errorString)
64}64}
6565
=== modified file 'unityscope.go'
--- unityscope.go 2015-03-17 14:36:12 +0000
+++ unityscope.go 2015-03-17 14:36:12 +0000
@@ -192,7 +192,7 @@
192 }192 }
193 scopeId := base[:len(base)-len(".ini")]193 scopeId := base[:len(base)-len(".ini")]
194194
195 var errorString *C.char = nil195 var errorString *C.char
196 C.run_scope(unsafe.Pointer(&scopeId), unsafe.Pointer(runtimeConfig), unsafe.Pointer(scopeConfig), unsafe.Pointer(&scope), &errorString)196 C.run_scope(unsafe.Pointer(&scopeId), unsafe.Pointer(runtimeConfig), unsafe.Pointer(scopeConfig), unsafe.Pointer(&scope), &errorString)
197 return checkError(errorString)197 return checkError(errorString)
198}198}

Subscribers

People subscribed via source and target branches

to all changes: