patch-support_nfs_conffile_c 1.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142
  1. --- nfs-utils-1.3.0.orig/support/nfs/conffile.c 2014-03-25 16:12:07.000000000 +0100
  2. +++ nfs-utils-1.3.0/support/nfs/conffile.c 2014-05-17 21:30:36.886783421 +0200
  3. @@ -72,10 +72,10 @@ TAILQ_HEAD (conf_trans_head, conf_trans)
  4. /*
  5. * Radix-64 Encoding.
  6. */
  7. -static const u_int8_t bin2asc[]
  8. +static const uint8_t bin2asc[]
  9. = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
  10. -static const u_int8_t asc2bin[] =
  11. +static const uint8_t asc2bin[] =
  12. {
  13. 255, 255, 255, 255, 255, 255, 255, 255,
  14. 255, 255, 255, 255, 255, 255, 255, 255,
  15. @@ -109,10 +109,10 @@ LIST_HEAD (conf_bindings, conf_binding)
  16. static char *conf_addr;
  17. -static __inline__ u_int8_t
  18. +static __inline__ uint8_t
  19. conf_hash(char *s)
  20. {
  21. - u_int8_t hash = 0;
  22. + uint8_t hash = 0;
  23. while (*s) {
  24. hash = ((hash << 1) | (hash >> 7)) ^ tolower (*s);
  25. @@ -603,10 +603,10 @@ cleanup:
  26. /* Decode a PEM encoded buffer. */
  27. int
  28. -conf_decode_base64 (u_int8_t *out, u_int32_t *len, u_char *buf)
  29. +conf_decode_base64 (uint8_t *out, uint32_t *len, unsigned char *buf)
  30. {
  31. - u_int32_t c = 0;
  32. - u_int8_t c1, c2, c3, c4;
  33. + uint32_t c = 0;
  34. + uint8_t c1, c2, c3, c4;
  35. while (*buf) {
  36. if (*buf > 127 || (c1 = asc2bin[*buf]) == 255)