Changeset 132ab5d1 in mainline for uspace/app/mkmfs/mkmfs.c


Ignore:
Timestamp:
2018-01-30T03:20:45Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5a6cc679
Parents:
8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/mkmfs/mkmfs.c

    r8bfb163 r132ab5d1  
    109109int main (int argc, char **argv)
    110110{
    111         int rc, c, opt_ind;
     111        int rc;
     112        int c, opt_ind;
    112113        char *device_name;
    113114        size_t devblock_size;
    … …  
    289290 * @param sb            Pointer to the superblock structure.
    290291 *
    291  * @return              EOK on success or a negative error code.
     292 * @return              EOK on success or an error code.
    292293 */
    293294static int insert_dentries(const struct mfs_sb_info *sb)
    … …  
    342343 * @param sb            Pointer to the superblock structure.
    343344 *
    344  * @return              EOK on success or a negative error code.
     345 * @return              EOK on success or an error code.
    345346 */
    346347static int init_inode_table(const struct mfs_sb_info *sb)
    … …  
    375376 * @param sb            Ponter to the superblock structure.
    376377 *
    377  * @return              EOK on success or a negative error code.
     378 * @return              EOK on success or an error code.
    378379 */
    379380static int make_root_ino(const struct mfs_sb_info *sb)
    … …  
    412413 * @param sb            Pointer to the superblock structure.
    413414 *
    414  * @return              EOK on success or a negative error code.
     415 * @return              EOK on success or an error code.
    415416 */
    416417static int make_root_ino2(const struct mfs_sb_info *sb)
    … …  
    451452 * @param sb            Pointer to the superblock structure.
    452453 *
    453  * @return              EOK on success or a negative error code.
     454 * @return              EOK on success or an error code.
    454455 */
    455456static int init_superblock(struct mfs_sb_info *sb)
    … …  
    558559 * @param sbi           Pointer to the superblock structure to write on disk.
    559560 *
    560  * @return              EOK on success or a negative error code.
     561 * @return              EOK on success or an error code.
    561562 */
    562563static int write_superblock(const struct mfs_sb_info *sbi)
    … …  
    591592 * @param sbi           Pointer to the superblock structure to write on disk.
    592593 *
    593  * @return              EOK on success or a negative error code.
     594 * @return              EOK on success or an error code.
    594595 */
    595596static int write_superblock3(const struct mfs_sb_info *sbi)
    … …  
    624625 * @param sb            Pointer to the superblock structure.
    625626 *
    626  * @return              EOK on success or a negative error code.
     627 * @return              EOK on success or an error code.
    627628 */
    628629static int init_bitmaps(const struct mfs_sb_info *sb)
    … …  
    698699 * @param data          Pointer to the block content.
    699700 *
    700  * @return              EOK on success or a negative error number.
     701 * @return              EOK on success or a error number.
    701702 */
    702703static inline int write_block(aoff64_t off, size_t size, const void *data)
Note: See TracChangeset for help on using the changeset viewer.