diff options
| author | Peter Jones <pjones@redhat.com> | 2005-12-05 19:05:38 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2005-12-05 19:05:38 +0000 |
| commit | 19577a610fd33e23b9b07082086c31f1b00da273 (patch) | |
| tree | 0408d42978acb8ce990ef7d5299efb45e7fee9f3 | |
| parent | e4c458236ff84cc6e867eaf638a568e561cab592 (diff) | |
| download | anaconda-19577a610fd33e23b9b07082086c31f1b00da273.tar.gz anaconda-19577a610fd33e23b9b07082086c31f1b00da273.tar.xz anaconda-19577a610fd33e23b9b07082086c31f1b00da273.zip | |
* isys/nfsmount_xdr.c (xdr_mountres3_ok): reformat weird tabbing,
and don't type-pun any more.
* isys/linkdetect.c (mdio_read): no type-punning.
* loader/moduleinfo.c (readModuleInfo): fix typo (+ instead of +=) that
gcc41 complains about.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | isys/linkdetect.c | 3 | ||||
| -rw-r--r-- | isys/nfsmount_xdr.c | 13 | ||||
| -rw-r--r-- | loader2/moduleinfo.c | 2 |
4 files changed, 19 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2005-12-05 Peter Jones <pjones@redhat.com> + + * isys/nfsmount_xdr.c (xdr_mountres3_ok): reformat weird tabbing, + and don't type-pun any more. + * isys/linkdetect.c (mdio_read): no type-punning. + * loader/moduleinfo.c (readModuleInfo): fix typo (+ instead of +=) that + gcc41 complains about. + 2005-12-02 David Cantrell <dcantrell@redhat.com> * loader2/mediacheck.c: Reworded the media check result dialog to diff --git a/isys/linkdetect.c b/isys/linkdetect.c index e6e8325c9..d2bfe37c4 100644 --- a/isys/linkdetect.c +++ b/isys/linkdetect.c @@ -42,7 +42,8 @@ static struct ifreq ifr; static int mdio_read(int skfd, int location) { - struct mii_data *mii = (struct mii_data *)&ifr.ifr_data; + void *data = &ifr.ifr_data; + struct mii_data *mii = data; mii->reg_num = location; if (ioctl(skfd, SIOCGMIIREG, &ifr) < 0) { #ifdef STANDALONE diff --git a/isys/nfsmount_xdr.c b/isys/nfsmount_xdr.c index 3810118b4..bfe1f758d 100644 --- a/isys/nfsmount_xdr.c +++ b/isys/nfsmount_xdr.c @@ -83,11 +83,14 @@ xdr_fhstatus (XDR *xdrs, fhstatus *objp) bool_t xdr_mountres3_ok (XDR *xdrs, mountres3_ok *objp) { - if (!xdr_fhandle3 (xdrs, &objp->fhandle)) - return FALSE; - if (!xdr_array (xdrs, (char **)&objp->auth_flavours.auth_flavours_val, (u_int *) &objp->auth_flavours.auth_flavours_len, ~0, - sizeof (int), (xdrproc_t) xdr_int)) - return FALSE; + void *val = &objp->auth_flavours.auth_flavours_val; + unsigned int *len = (u_int *) &objp->auth_flavours.auth_flavours_len; + + if (!xdr_fhandle3 (xdrs, &objp->fhandle)) + return FALSE; + if (!xdr_array (xdrs, (char **)val, len, ~0, sizeof (int), + (xdrproc_t) xdr_int)) + return FALSE; return TRUE; } diff --git a/loader2/moduleinfo.c b/loader2/moduleinfo.c index ad8d58e3b..8ac18aa30 100644 --- a/loader2/moduleinfo.c +++ b/loader2/moduleinfo.c @@ -116,7 +116,7 @@ int readModuleInfo(const char * filename, moduleInfoSet mis, /* slice and dice */ next = chptr + 1; } else { - chptr + strlen(start) - 1; + chptr += strlen(start) - 1; } chptr--; |