Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicts from last checkin.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6393 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
clayton
1998-07-24 15:19:10 +00:00
parent bd3d6d162c
commit fd87d7144a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/directory/perldap/API.xs
View File

@@ -1,8 +1,5 @@
<<<<<<< API.xs
=======
/*
*******************************************************************************
* $Id: API.xs,v 1.4 1998-07-23 12:34:32 clayton Exp $
/******************************************************************************
* $Id: API.xs,v 1.5 1998-07-24 15:19:10 clayton Exp $
*
* The contents of this file are subject to the Mozilla Public License
* Version 1.0 (the "License"); you may not use this file except in
@@ -25,9 +22,8 @@
* DESCRIPTION
* This is the XSUB interface for the API.
*
*******************************************************************************/
*****************************************************************************/
>>>>>>> 1.3
#ifdef __cplusplus
extern "C" {
#endif
@@ -150,7 +146,7 @@ SV* charptrptr2avref(char **cppval)
SV* SVval = newSVpv(cppval[ix],0);
av_push(tmp_av,SVval);
}
ldap_values_free(cppval);
ldap_value_free(cppval);
}
return(tmp_ref);
}
@@ -170,7 +166,7 @@ SV* berptrptr2avref(struct berval **bval)
SV *SVval = newSVpv(bval[ix]->bv_val,bval[ix]->bv_len);
av_push(tmp_av,SVval);
}
ldap_values_free_len(bval);
ldap_value_free_len(bval);
}
return(tmp_ref);
}