Skip to content

Commit

Permalink
Merge branch 'master' into feature/updsocket
Browse files Browse the repository at this point in the history
  • Loading branch information
umlaeute committed Mar 14, 2024
2 parents 400abde + 2895a75 commit 3a03a49
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .git-ci/gitlab-iem.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
---
#variables:
# IEM_CI_PKGLIBDIR: "multiarch"

include:
- https://git.iem.at/pd/iem-ci/raw/master/pd-lib-builder/gitlab-iem.yml
- https://git.iem.at/pd/iem-ci/raw/-/main/pd-lib-builder/gitlab-iem.yml
7 changes: 7 additions & 0 deletions .github/workflows/pd-lib-builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: pd-lib-builder

on: push

jobs:
pd-lib-builder:
uses: pure-data/pure-data-ci/.github/workflows/pd-lib-builder.yml@main
6 changes: 3 additions & 3 deletions iemnet.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,13 @@ void iemnet__socket2addressout(int sockfd, t_outlet*status_outlet, t_symbol*s) {
t_atom alist[18];
int alen;
if (getsockname(sockfd, (struct sockaddr *) &address, &addresssize)) {
error("unable to get address from socket:%d", sockfd);
pd_error(0, "unable to get address from socket:%d", sockfd);
return;
}
if ((alen = iemnet__sockaddr2list(&address, alist))) {
outlet_anything(status_outlet, s, alen, alist);
} else {
error("unknown address-family:0x%02X on socket:%d", address.ss_family, sockfd);
pd_error(0, "unknown address-family:0x%02X on socket:%d", address.ss_family, sockfd);
}
}

Expand Down Expand Up @@ -475,7 +475,7 @@ void iemnet_debuglevel(void*x, t_float f)
post("iemnet: setting debuglevel to %d", debuglevel);
#else
if(firsttime) {
error("iemnet compiled without debug!");
pd_error(x, "iemnet compiled without debug!");
}
#endif
if(firsttime) {
Expand Down
4 changes: 2 additions & 2 deletions iemnet_sender.c
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ int iemnet__sender_getsockopt(t_iemnet_sender*s, int level, int optname,
{
int result = getsockopt(s->sockfd, level, optname, optval, optlen);
if(result != 0) {
error("iemnet::sender: getsockopt returned %d",
pd_error(0, "iemnet::sender: getsockopt returned %d",
iemnet__sender_getlasterror(s));
}
return result;
Expand All @@ -286,7 +286,7 @@ int iemnet__sender_setsockopt(t_iemnet_sender*s, int level, int optname,
{
int result = setsockopt(s->sockfd, level, optname, optval, optlen);
if(result != 0) {
error("iemnet::sender: setsockopt returned %d",
pd_error(0, "iemnet::sender: setsockopt returned %d",
iemnet__sender_getlasterror(s));
}
return result;
Expand Down
4 changes: 2 additions & 2 deletions udpserver.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ static void udpserver_do_bind(t_udpserver*x, t_symbol*ifaddr, unsigned short por
static void udpserver_port(t_udpserver*x, t_floatarg fportno)
{
if(fportno<0 || (int)fportno >= 0xFFFF) {
error("[%s] port %d out of range", objName, (int)fportno);
pd_error(x, "[%s] port %d out of range", objName, (int)fportno);
return;
}
udpserver_do_bind(x, 0, (unsigned short)fportno);
Expand All @@ -776,7 +776,7 @@ static void udpserver_bind(t_udpserver*x, t_symbol*s, int argc, t_atom*argv) {
case 2: /* address, port */ {
t_float fportno = atom_getfloat(argv+1);
if(fportno<0 || (int)fportno > 0xFFFF) {
error("[%s] port %d out of range", objName, (int)fportno);
pd_error(x, "[%s] port %d out of range", objName, (int)fportno);
return;
}
port = (unsigned short)fportno;
Expand Down

0 comments on commit 3a03a49

Please sign in to comment.