vlentryp->nextIdHash[i] = ntohl(vlentryp->nextIdHash[i]);
vlentryp->nextNameHash = ntohl(vlentryp->nextNameHash);
for (i = 0; i < NMAXNSERVERS; i++) {
- vlentryp->serverNumber[i] = ntohl(vlentryp->serverNumber[i]);
- vlentryp->serverPartition[i] = ntohl(vlentryp->serverPartition[i]);
- vlentryp->serverFlags[i] = ntohl(vlentryp->serverFlags[i]);
+ /* make sure not to ntohl these, as they're chars, not ints */
+ vlentryp->serverNumber[i] = vlentryp->serverNumber[i];
+ vlentryp->serverPartition[i] = vlentryp->serverPartition[i];
+ vlentryp->serverFlags[i] = vlentryp->serverFlags[i];
}
if (vlentryp->flags == VLCONTBLOCK) {
vlentryp->nextIdHash[i] = htonl(vlentryp->nextIdHash[i]);
vlentryp->nextNameHash = htonl(vlentryp->nextNameHash);
for (i = 0; i < NMAXNSERVERS; i++) {
- vlentryp->serverNumber[i] = htonl(vlentryp->serverNumber[i]);
- vlentryp->serverPartition[i] = htonl(vlentryp->serverPartition[i]);
- vlentryp->serverFlags[i] = htonl(vlentryp->serverFlags[i]);
+ /* make sure not to htonl these, as they're chars, not ints */
+ vlentryp->serverNumber[i] = vlentryp->serverNumber[i] ;
+ vlentryp->serverPartition[i] = vlentryp->serverPartition[i] ;
+ vlentryp->serverFlags[i] = vlentryp->serverFlags[i] ;
}
vldbwrite(addr, (char *)vlentryp, sizeof(*vlentryp));
}
maxentries = (header.vital_header.eofPtr / sizeof(vlentry)) + 1;
record = (struct er *)malloc(maxentries * sizeof(struct er));
- memset((char *)record, 0, (maxentries * sizeof(struct er)));
- memset((char *)serveraddrs, 0, sizeof(serveraddrs));
+ memset(record, 0, (maxentries * sizeof(struct er)));
+ memset(serveraddrs, 0, sizeof(serveraddrs));
/* Will fill in the record array of entries it found */
ReadAllEntries(&header);