Skip to content

emb6: prepare for #6211#6225

Merged
miri64 merged 1 commit intoRIOT-OS:masterfrom
miri64:pkg/fix/emb6-prep-6211
Jan 10, 2017
Merged

emb6: prepare for #6211#6225
miri64 merged 1 commit intoRIOT-OS:masterfrom
miri64:pkg/fix/emb6-prep-6211

Conversation

@miri64
Copy link
Copy Markdown
Member

@miri64 miri64 commented Dec 15, 2016 •
edited by haukepetersen
Loading

This is a patch change, so please review carefully!!1! 😉

#6211 introduces a new function list_remove(). Unfortunately, there is a function of the same name in emb6. Since I did that before for other functions like clist and list I continue the effort here and renamed their list_remove() to emb6_list_remove().

@miri64 miri64 added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Dec 15, 2016
@miri64 miri64 added this to the Release 2017.01 milestone Dec 15, 2016
@miri64 miri64 force-pushed the pkg/fix/emb6-prep-6211 branch 2 times, most recently from 6c90972 to 99320eb Compare December 15, 2016 11:19
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Dec 15, 2016

(removed whitespace changes and squashed to make the diff less confusing... I hope)

lebrush
lebrush approved these changes Dec 15, 2016
View reviewed changes
Copy link
Copy Markdown
Member

@lebrush lebrush left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @miri64! I didn't test it but the changes look pretty straight forward (mostly a s/list_remove/emb6_list_remove, right?)

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Dec 15, 2016

Thanks @miri64! I didn't test it but the changes look pretty straight forward (mostly a s/list_remove/emb6_list_remove, right?)

I literally just did

git grep --name-only "\<list_remove\>" | xargs sed -i 's/\<list_remove\>/emb6_\0/g'

;-)

haukepetersen
haukepetersen approved these changes Dec 15, 2016
View reviewed changes
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proxy ACK

@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Dec 15, 2016

Turns out: those whitespaces were important :-/

@lebrush
Copy link
Copy Markdown
Member

lebrush commented Dec 19, 2016

It seems so... :-)

/data/riotbuild/examples/arduino_hello-world/_sketches.cpp:2:7: error: expected constructor, destructor, or type conversion before 'the'
/data/riotbuild/examples/arduino_hello-world/_sketches.cpp:5:5: error: expected unqualified-id before 'while'
/data/riotbuild/examples/arduino_hello-world/_sketches.cpp:9:5: error: expected unqualified-id before 'return'
/data/riotbuild/examples/arduino_hello-world/_sketches.cpp:10:1: error: expected declaration before '}' token

@smlng smlng added CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Dec 20, 2016
@smlng
Copy link
Copy Markdown
Member

smlng commented Dec 20, 2016

please squash, 'cause murdock unhappy

@PeterKietzmann
Copy link
Copy Markdown
Member

PeterKietzmann commented Jan 10, 2017

@miri64 please squash. This PR was already ACKed

@miri64 miri64 force-pushed the pkg/fix/emb6-prep-6211 branch from 16571f3 to 185be4e Compare January 10, 2017 12:49
@miri64
Copy link
Copy Markdown
Member Author

miri64 commented Jan 10, 2017

Sorry, lost track of this

@miri64 miri64 added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Jan 10, 2017
@miri64 miri64 merged commit 94b7c08 into RIOT-OS:master Jan 10, 2017
@miri64 miri64 deleted the pkg/fix/emb6-prep-6211 branch January 10, 2017 21:12
@miri64 miri64 mentioned this pull request Jan 10, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@haukepetersen haukepetersen haukepetersen approved these changes

+1 more reviewer

@lebrush lebrush lebrush approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lebrush lebrush

@OlegHahm OlegHahm

Labels

Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@miri64 @lebrush @smlng @PeterKietzmann @haukepetersen @OlegHahm