jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-28 09:02:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

cam_get_device() was returning 0 on failure, and 1 on success, while

Browse Source 
camcontrol(8) and the documentation in camlib.c and cam(3) all expect
-1 on failure and 0 on success.  Updated camlib.c to return the values
specified by the documentation.

PR:	12023
This commit is contained in:
Mike Pritchard 1999-06-15 20:03:01 +00:00
parent d9a91c1439
commit 3d416122d3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47933
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/libcam/camlib.c
View File

@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: camlib.c,v 1.3 1998/11/15 23:12:42 ken Exp $
* $Id: camlib.c,v 1.4 1998/11/15 23:17:39 ken Exp $
*/
#include <sys/types.h>
@ -132,7 +132,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
if (path == NULL) {
sprintf(cam_errbuf, "%s: device pathname was NULL", func_name);
return(0);
return(-1);
}
/*
@ -159,7 +159,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
if (*tmpstr == '\0') {
sprintf(cam_errbuf, "%s: no text after slash", func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -172,7 +172,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
if (*tmpstr == '\0') {
sprintf(cam_errbuf, "%s: no text after leading 'n'", func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -184,7 +184,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
if (*tmpstr == '\0') {
sprintf(cam_errbuf, "%s: no text after leading 'r'", func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -227,7 +227,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
"%s: must have both device name and unit number",
func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -239,7 +239,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
"%s: device name cannot begin with a number",
func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -251,7 +251,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
sprintf(cam_errbuf, "%s: unable to find device unit number",
func_name);
free(newpath);
return(0);
return(-1);
}
/*
@ -302,7 +302,7 @@ cam_get_device(const char *path, char *dev_name, int devnamelen, int *unit)
/* Clean up allocated memory */
free(newpath);
return(1);
return(0);
}
@ -321,7 +321,7 @@ cam_open_device(const char *path, int flags)
* cam_get_device() has already put an error message in cam_errbuf,
* so we don't need to.
*/
if (cam_get_device(path, dev_name, DEV_IDLEN + 1, &unit) == 0)
if (cam_get_device(path, dev_name, DEV_IDLEN + 1, &unit) == -1)
return(NULL);
return(cam_lookup_pass(dev_name, unit, flags, path, NULL));