diff options
author | nyan <nyan@FreeBSD.org> | 2002-11-15 13:24:29 +0000 |
---|---|---|
committer | nyan <nyan@FreeBSD.org> | 2002-11-15 13:24:29 +0000 |
commit | 6677381325604b5404dc24855d477b72fcd3ad95 (patch) | |
tree | d03d1e9b1f00b3ca30c6b7c90866d9495e4dfeed /lib/libdisk/create_chunk.c | |
parent | abff45d114507b07cdaace4b07ff55e179442f82 (diff) | |
download | FreeBSD-src-6677381325604b5404dc24855d477b72fcd3ad95.zip FreeBSD-src-6677381325604b5404dc24855d477b72fcd3ad95.tar.gz |
Fixed style(9)
Diffstat (limited to 'lib/libdisk/create_chunk.c')
-rw-r--r-- | lib/libdisk/create_chunk.c | 86 |
1 files changed, 51 insertions, 35 deletions
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index 7acb9b5..dfccb9d 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -39,57 +39,66 @@ Fixup_FreeBSD_Names(struct disk *d, struct chunk *c) struct chunk *c1, *c3; int j; - if (!strcmp(c->name, "X")) return 0; + if (!strcmp(c->name, "X")) + return 0; /* reset all names to "X" */ for (c1 = c->part; c1; c1 = c1->next) { c1->oname = c1->name; c1->name = malloc(12); - if(!c1->name) return -1; + if (!c1->name) + return -1; strcpy(c1->name,"X"); } /* Allocate the first swap-partition we find */ for (c1 = c->part; c1; c1 = c1->next) { - if (c1->type == unused) continue; - if (c1->subtype != FS_SWAP) continue; + if (c1->type == unused) + continue; + if (c1->subtype != FS_SWAP) + continue; sprintf(c1->name, "%s%c", c->name, SWAP_PART + 'a'); break; } /* Allocate the first root-partition we find */ for (c1 = c->part; c1; c1 = c1->next) { - if (c1->type == unused) continue; - if (!(c1->flags & CHUNK_IS_ROOT)) continue; + if (c1->type == unused) + continue; + if (!(c1->flags & CHUNK_IS_ROOT)) + continue; sprintf(c1->name, "%s%c", c->name, 0 + 'a'); break; } /* Try to give them the same as they had before */ for (c1 = c->part; c1; c1 = c1->next) { - if (strcmp(c1->name, "X")) continue; - for(c3 = c->part; c3 ; c3 = c3->next) - if (c1 != c3 && !strcmp(c3->name, c1->oname)) { - goto newname; - } + if (strcmp(c1->name, "X")) + continue; + for (c3 = c->part; c3 ; c3 = c3->next) + if (c1 != c3 && !strcmp(c3->name, c1->oname)) + goto newname; strcpy(c1->name, c1->oname); - newname: ; + newname: + ; } - - + /* Allocate the rest sequentially */ for (c1 = c->part; c1; c1 = c1->next) { const char order[] = "defghab"; - if (c1->type == unused) continue; - if (strcmp("X", c1->name)) continue; + + if (c1->type == unused) + continue; + if (strcmp("X", c1->name)) + continue; - for(j = 0; j < strlen(order); j++) { + for (j = 0; j < strlen(order); j++) { sprintf(c1->name, "%s%c", c->name, order[j]); - for(c3 = c->part; c3 ; c3 = c3->next) + for (c3 = c->part; c3 ; c3 = c3->next) if (c1 != c3 && !strcmp(c3->name, c1->name)) goto match; break; - match: + match: strcpy(c1->name, "X"); continue; } @@ -106,13 +115,15 @@ static int Fixup_Extended_Names(struct disk *d, struct chunk *c) { struct chunk *c1; - int j=5; + int j = 5; for (c1 = c->part; c1; c1 = c1->next) { - if (c1->type == unused) continue; + if (c1->type == unused) + continue; free(c1->name); c1->name = malloc(12); - if(!c1->name) return -1; + if (!c1->name) + return -1; sprintf(c1->name, "%ss%d", d->chunks->name, j++); if (c1->type == freebsd) if (Fixup_FreeBSD_Names(d, c1) != 0) @@ -132,17 +143,18 @@ Fixup_Names(struct disk *d) #endif c1 = d->chunks; - for(c2 = c1->part; c2 ; c2 = c2->next) { + for (c2 = c1->part; c2 ; c2 = c2->next) { if (c2->type == unused) continue; if (strcmp(c2->name, "X")) continue; #if defined(__i386__) || defined(__ia64__) c2->oname = malloc(12); - if(!c2->oname) return -1; - for(j = 1; j <= NDOSPART; j++) { + if (!c2->oname) + return -1; + for (j = 1; j <= NDOSPART; j++) { sprintf(c2->oname, "%ss%d", c1->name, j); - for(c3 = c1->part; c3; c3 = c3->next) + for (c3 = c1->part; c3; c3 = c3->next) if (c3 != c2 && !strcmp(c3->name, c2->oname)) goto match; free(c2->name); @@ -159,7 +171,7 @@ Fixup_Names(struct disk *d) c2->name = strdup(c1->name); #endif /*__i386__*/ } - for(c2 = c1->part; c2; c2 = c2->next) { + for (c2 = c1->part; c2; c2 = c2->next) { if (c2->type == freebsd) Fixup_FreeBSD_Names(d, c2); #ifndef PC98 @@ -171,12 +183,13 @@ Fixup_Names(struct disk *d) } int -Create_Chunk(struct disk *d, u_long offset, u_long size, chunk_e type, int subtype, u_long flags, const char *sname) +Create_Chunk(struct disk *d, u_long offset, u_long size, chunk_e type, + int subtype, u_long flags, const char *sname) { int i; u_long l; - if(!(flags & CHUNK_FORCE_ALL)) { + if (!(flags & CHUNK_FORCE_ALL)) { #ifdef PC98 /* Never use the first cylinder */ if (!offset) { @@ -202,7 +215,8 @@ Create_Chunk(struct disk *d, u_long offset, u_long size, chunk_e type, int subty } struct chunk * -Create_Chunk_DWIM(struct disk *d, const struct chunk *parent , u_long size, chunk_e type, int subtype, u_long flags) +Create_Chunk_DWIM(struct disk *d, const struct chunk *parent , u_long size, + chunk_e type, int subtype, u_long flags) { int i; struct chunk *c1; @@ -210,19 +224,21 @@ Create_Chunk_DWIM(struct disk *d, const struct chunk *parent , u_long size, chun if (!parent) parent = d->chunks; - for (c1=parent->part; c1; c1 = c1->next) { - if (c1->type != unused) continue; - if (c1->size < size) continue; + for (c1 = parent->part; c1; c1 = c1->next) { + if (c1->type != unused) + continue; + if (c1->size < size) + continue; offset = c1->offset; goto found; } return 0; - found: +found: i = Add_Chunk(d, offset, size, "X", type, subtype, flags, "-"); if (i) return 0; Fixup_Names(d); - for (c1=parent->part; c1; c1 = c1->next) + for (c1 = parent->part; c1; c1 = c1->next) if (c1->offset == offset) return c1; /* barfout(1, "Serious internal trouble"); */ |