diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-06 17:18:04 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-01-13 15:39:14 -0500 |
| commit | 04258cf9107761f8e08c58964d59d5d628ad7eea (patch) | |
| tree | 64667751f39945d59d43cf59d18ac984fba8ffbe /support/export/export.c | |
| parent | 55257d644359aec6fba463968bd503d5ae231eb7 (diff) | |
| download | nfs-utils-04258cf9107761f8e08c58964d59d5d628ad7eea.tar.gz nfs-utils-04258cf9107761f8e08c58964d59d5d628ad7eea.tar.xz nfs-utils-04258cf9107761f8e08c58964d59d5d628ad7eea.zip | |
exports: export_read() cleanup
Use standard indentation, move warnings to helper function.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'support/export/export.c')
| -rw-r--r-- | support/export/export.c | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/support/export/export.c b/support/export/export.c index e5e6cb0..2943466 100644 --- a/support/export/export.c +++ b/support/export/export.c @@ -28,6 +28,22 @@ static int export_check(nfs_export *, struct hostent *, char *); static nfs_export * export_allowed_internal(struct hostent *hp, char *path); +static void warn_duplicated_exports(nfs_export *exp, struct exportent *eep) +{ + if (exp->m_export.e_flags != eep->e_flags) { + xlog(L_ERROR, "incompatible duplicated export entries:"); + xlog(L_ERROR, "\t%s:%s (0x%x) [IGNORED]", eep->e_hostname, + eep->e_path, eep->e_flags); + xlog(L_ERROR, "\t%s:%s (0x%x)", exp->m_export.e_hostname, + exp->m_export.e_path, exp->m_export.e_flags); + } else { + xlog(L_ERROR, "duplicated export entries:"); + xlog(L_ERROR, "\t%s:%s", eep->e_hostname, eep->e_path); + xlog(L_ERROR, "\t%s:%s", exp->m_export.e_hostname, + exp->m_export.e_path); + } +} + int export_read(char *fname) { @@ -36,27 +52,13 @@ export_read(char *fname) setexportent(fname, "r"); while ((eep = getexportent(0,1)) != NULL) { - exp = export_lookup(eep->e_hostname, eep->e_path, 0); - if (!exp) - export_create(eep,0); - else { - if (exp->m_export.e_flags != eep->e_flags) { - xlog(L_ERROR, "incompatible duplicated export entries:"); - xlog(L_ERROR, "\t%s:%s (0x%x) [IGNORED]", eep->e_hostname, - eep->e_path, eep->e_flags); - xlog(L_ERROR, "\t%s:%s (0x%x)", exp->m_export.e_hostname, - exp->m_export.e_path, exp->m_export.e_flags); - } - else { - xlog(L_ERROR, "duplicated export entries:"); - xlog(L_ERROR, "\t%s:%s", eep->e_hostname, eep->e_path); - xlog(L_ERROR, "\t%s:%s", exp->m_export.e_hostname, - exp->m_export.e_path); - } - } + exp = export_lookup(eep->e_hostname, eep->e_path, 0); + if (!exp) + export_create(eep, 0); + else + warn_duplicated_exports(exp, eep); } endexportent(); - return 0; } |