summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharles forsyth <charles.forsyth@gmail.com>2014-03-02 11:56:16 +0000
committercharles forsyth <charles.forsyth@gmail.com>2014-03-02 11:56:16 +0000
commit8eb013de88b69d0256e7d37913ab46510908b510 (patch)
treea879fc50fbaeedf8689e579255034abb055d99aa
parent2a557437fb2b2918e7ad37507a97dcf2dc164545 (diff)
20140302-1156
-rw-r--r--CHANGES1
-rw-r--r--os/ip/ipaux.c1
-rw-r--r--os/ipaq1110/archipaq.c2
-rw-r--r--os/sa1110/devuart.c3
4 files changed, 6 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 4f761e6c..f2276beb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
20140302
utils/cc/funct.c - remove out-of-bounds reference
+ os/ipaq1110, ip/ipaux.c, os/sa1110 - add default cases to keep compiler happy
20140223
/dis/sig: use raise not exit for errors
20140105
diff --git a/os/ip/ipaux.c b/os/ip/ipaux.c
index 2ddae041..f4637bd4 100644
--- a/os/ip/ipaux.c
+++ b/os/ip/ipaux.c
@@ -283,7 +283,6 @@ eipfmt(Fmt *f)
case 'E': /* Ethernet address */
p = va_arg(f->args, uchar*);
return fmtprint(f, efmt, p[0], p[1], p[2], p[3], p[4], p[5]);
- return fmtstrcpy(f, buf);
case 'I': /* Ip address */
p = va_arg(f->args, uchar*);
diff --git a/os/ipaq1110/archipaq.c b/os/ipaq1110/archipaq.c
index 0e3c726b..7d99b70c 100644
--- a/os/ipaq1110/archipaq.c
+++ b/os/ipaq1110/archipaq.c
@@ -343,6 +343,8 @@ pcmpin(int slot, int type)
return slot==0? 17: 10;
case PCMstschng:
return -1;
+ default:
+ return -1;
}
}
diff --git a/os/sa1110/devuart.c b/os/sa1110/devuart.c
index 65eb17a3..4df51960 100644
--- a/os/sa1110/devuart.c
+++ b/os/sa1110/devuart.c
@@ -656,6 +656,9 @@ uartwrite(Chan *c, void *buf, long n, vlong offset)
cmd[n] = 0;
uartctl(p, cmd);
return n;
+ default:
+ error(Egreg);
+ return 0;
}
}