diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-31 10:31:51 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-03-31 10:31:51 +0200 |
commit | 9e59e27cdfd58897b163ef554ee44bd418118081 (patch) | |
tree | 02cf5cdfb95aa9bd0de5eb5d31d76ed53da7fd1c | |
parent | 57dc3c7b4c31d3c67104f3a40c3b106483801961 (diff) | |
download | busybox-w32-9e59e27cdfd58897b163ef554ee44bd418118081.tar.gz busybox-w32-9e59e27cdfd58897b163ef554ee44bd418118081.tar.bz2 busybox-w32-9e59e27cdfd58897b163ef554ee44bd418118081.zip |
libpwdgrp: code style fixes, no real code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | libpwdgrp/pwd_grp.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c index 5b0d6b245..acb1d96bb 100644 --- a/libpwdgrp/pwd_grp.c +++ b/libpwdgrp/pwd_grp.c | |||
@@ -229,7 +229,7 @@ int sgetspent_r(const char *string, struct spwd *result_buf, | |||
229 | *result = NULL; | 229 | *result = NULL; |
230 | 230 | ||
231 | if (buflen < PWD_BUFFER_SIZE) { | 231 | if (buflen < PWD_BUFFER_SIZE) { |
232 | DO_ERANGE: | 232 | DO_ERANGE: |
233 | errno=rv; | 233 | errno=rv; |
234 | goto DONE; | 234 | goto DONE; |
235 | } | 235 | } |
@@ -722,7 +722,7 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f) | |||
722 | assert(p->gr_mem); | 722 | assert(p->gr_mem); |
723 | m = p->gr_mem; | 723 | m = p->gr_mem; |
724 | 724 | ||
725 | do { | 725 | while (1) { |
726 | if (!*m) { | 726 | if (!*m) { |
727 | if (fputc('\n', f) >= 0) { | 727 | if (fputc('\n', f) >= 0) { |
728 | rv = 0; | 728 | rv = 0; |
@@ -734,10 +734,8 @@ int putgrent(const struct group *__restrict p, FILE *__restrict f) | |||
734 | } | 734 | } |
735 | ++m; | 735 | ++m; |
736 | fmt = format; | 736 | fmt = format; |
737 | } while (1); | 737 | } |
738 | |||
739 | } | 738 | } |
740 | |||
741 | } | 739 | } |
742 | 740 | ||
743 | return rv; | 741 | return rv; |
@@ -788,7 +786,7 @@ int putspent(const struct spwd *p, FILE *stream) | |||
788 | rv = 0; | 786 | rv = 0; |
789 | } | 787 | } |
790 | 788 | ||
791 | DO_UNLOCK: | 789 | DO_UNLOCK: |
792 | return rv; | 790 | return rv; |
793 | } | 791 | } |
794 | #endif | 792 | #endif |
@@ -814,7 +812,7 @@ static int bb__parsepwent(void *data, char *line) | |||
814 | int i; | 812 | int i; |
815 | 813 | ||
816 | i = 0; | 814 | i = 0; |
817 | do { | 815 | while (1) { |
818 | p = (char *) data + pw_off[i]; | 816 | p = (char *) data + pw_off[i]; |
819 | 817 | ||
820 | if ((i & 6) ^ 2) { /* i!=2 and i!=3 */ | 818 | if ((i & 6) ^ 2) { /* i!=2 and i!=3 */ |
@@ -848,7 +846,7 @@ static int bb__parsepwent(void *data, char *line) | |||
848 | 846 | ||
849 | *line++ = 0; | 847 | *line++ = 0; |
850 | ++i; | 848 | ++i; |
851 | } while (1); | 849 | } /* while (1) */ |
852 | 850 | ||
853 | return -1; | 851 | return -1; |
854 | } | 852 | } |
@@ -871,7 +869,7 @@ static int bb__parsegrent(void *data, char *line) | |||
871 | 869 | ||
872 | end_of_buf = ((struct group *) data)->gr_name; /* Evil hack! */ | 870 | end_of_buf = ((struct group *) data)->gr_name; /* Evil hack! */ |
873 | i = 0; | 871 | i = 0; |
874 | do { | 872 | while (1) { |
875 | p = (char *) data + gr_off[i]; | 873 | p = (char *) data + gr_off[i]; |
876 | 874 | ||
877 | if (i < 2) { | 875 | if (i < 2) { |
@@ -934,17 +932,19 @@ static int bb__parsegrent(void *data, char *line) | |||
934 | 932 | ||
935 | if (--i) { | 933 | if (--i) { |
936 | p = endptr; /* Pointing to char prior to first member. */ | 934 | p = endptr; /* Pointing to char prior to first member. */ |
937 | do { | 935 | while (1) { |
938 | *members++ = ++p; | 936 | *members++ = ++p; |
939 | if (!--i) break; | 937 | if (!--i) |
940 | while (*++p) {} | 938 | break; |
941 | } while (1); | 939 | while (*++p) |
940 | continue; | ||
941 | } | ||
942 | } | 942 | } |
943 | *members = NULL; | 943 | *members = NULL; |
944 | 944 | ||
945 | return 0; | 945 | return 0; |
946 | } | 946 | } |
947 | } while (1); | 947 | } /* while (1) */ |
948 | 948 | ||
949 | ERR: | 949 | ERR: |
950 | return -1; | 950 | return -1; |