Changeset f261cc8 in buchla-68k for libcio/open.c

Timestamp:

07/16/2017 12:10:45 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

1c4f9be

Parents:

0c06bc5

Message:

Minor cleanup.

File:

• libcio/open.c (modified) (8 diffs)

libcio/open.c

@@ -34 +34 @@
 */
 
-int16_t open(int8_t *name, uint16_t flag)
+int16_t open(int8_t *name, uint16_t flags)
 {
         register struct devtabl *dp;
@@ -58 +58 @@
 
         dev = dp->d_dev;
-        mdmask = (flag & 3) + 1;
+        mdmask = (flags & 3) + 1;
 
         if (mdmask & 1) {       /* see if device is readable */
@@ -85 +85 @@
         chp->c_close = _nopc;
 
-        if ((*dev->d_open)(name, flag, chp, dp) < 0) {  /* open */
+        if ((*dev->d_open)(name, flags, chp, dp) < 0) { /* open */
 
                 chp->c_close = _badfc;  /* couldn't open for some reason */
@@ -96 +96 @@
 /*
    =============================================================================
-        opena(name, flag, mode) -- Opens ASCII file 'name' with flags 'flag'
-        and access mode 'mode'.  Newline translation will be done.
-        Returns a file descriptor (small positive integer) if successful, or
-        FAILURE (-1) if an error occurred.
-   =============================================================================
-*/
-
-int16_t opena(int8_t *name, uint16_t flag)
-{
-        return(open(name, flag));
-}
-
-/*
-   =============================================================================
-        openb(name, flag, mode) -- Opens binary file 'name' with flags 'flag'
-        and access mode 'mode'.  No newline translation is done.
-        Returns a file descriptor (small positive integer) if successful, or
-        FAILURE (-1) if an error occurred.
-   =============================================================================
-*/
-
-int16_t openb(int8_t *name, uint16_t flag)
-{
-        return(open(name, flag|O_RAW));
-}
-
-/*
-   =============================================================================
-        creat(name, mode) -- Creates file 'name' with access mode 'mode'.
+        opena(name, flag, mode) -- Opens ASCII file 'name' with flags 'flags'
+        Newline translation will be done.
+        Returns a file descriptor (small positive integer) if successful, or
+        FAILURE (-1) if an error occurred.
+   =============================================================================
+*/
+
+int16_t opena(int8_t *name, uint16_t flags)
+{
+        return(open(name, flags));
+}
+
+/*
+   =============================================================================
+        openb(name, flag, mode) -- Opens binary file 'name' with flags 'flags'.
+        No newline translation is done.
+        Returns a file descriptor (small positive integer) if successful, or
+        FAILURE (-1) if an error occurred.
+   =============================================================================
+*/
+
+int16_t openb(int8_t *name, uint16_t flags)
+{
+        return(open(name, flags|O_RAW));
+}
+
+/*
+   =============================================================================
+        creat(name, mode) -- Creates file 'name'.
         The created file is initially open for writing only.  The file
-        will be ASCII unless mode contains O_RAW.
+        will be ASCII.
         Returns a file descriptor (small positive integer) if successful, or
         FAILURE (-1) if an error occurred.
@@ -139 +139 @@
 /*
    =============================================================================
-        creata(name, mode) -- Creates ASCII file 'name' with access mode 'mode'.
+        creata(name, mode) -- Creates ASCII file 'name'.
         The created file is initially open for writing only.
         Files created with creata() do newline translations.
@@ -154 +154 @@
 /*
    =============================================================================
-        creatb(name, mode) -- create binary file 'name' with access mode 'mode'.
+        creatb(name, mode) -- create binary file 'name'.
         The created file is initially open for writing only.
         Files created with creatb don't do newline translations.
@@ -175 +175 @@
 */
 
-int16_t _fileop(int8_t *name, uint16_t flag, struct channel *chp, struct devtabl *dp)
+int16_t _fileop(int8_t *name, uint16_t flags, struct channel *chp, struct devtabl *dp)
 {
         register struct fcb *fp;
@@ -195 +195 @@
         /* setup the initial fcb */
 
-        if (_inifcb(fp, FilName(name, tmpname), FilExt(name, tmpext), flag)) {
+        if (_inifcb(fp, FilName(name, tmpname), FilExt(name, tmpext), flags)) {
 
                 errno = EINVAL;         /* bad file name or flags */